[gftp/autotools: 12/12] Update translations



commit f0c74cb0196d694b3703f83b7dadcdc82173d49b
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Sep 30 00:37:49 2013 +0100

    Update translations

 po/am.po          | 2595 +++++++++++++-----------
 po/ar.po          | 1461 +++++++-------
 po/as.po          | 1597 +++++++--------
 po/az.po          | 2560 +++++++++++++-----------
 po/be.po          | 2397 +++++++++++++---------
 po/bg.po          | 1963 +++++++++---------
 po/bn.po          | 2870 +++++++++++++++-----------
 po/bn_IN.po       | 1485 +++++++-------
 po/ca.po          | 1592 +++++++--------
 po/ca valencia po | 1510 +++++++-------
 po/cs.po          | 1524 +++++++--------
 po/da.po          | 1469 +++++++-------
 po/de.po          | 1566 +++++++-------
 po/dz.po          | 2123 ++++++++++----------
 po/el.po          | 1454 +++++++-------
 po/en_CA.po       | 1775 +++++++++--------
 po/en_GB.po       | 2112 ++++++++++----------
 po/eo.po          | 1444 +++++++-------
 po/es.po          | 1464 +++++++-------
 po/eu.po          | 1441 +++++++-------
 po/fi.po          | 1582 +++++++-------
 po/fr.po          | 1582 +++++++-------
 po/ga.po          | 2481 ++++++++++++----------
 po/gl.po          | 1446 +++++++-------
 po/gu.po          | 1512 +++++++-------
 po/he.po          | 1542 +++++++-------
 po/hi.po          | 1516 +++++++-------
 po/hr.po          | 2307 +++++++++++++--------
 po/hu.po          | 1446 +++++++-------
 po/it.po          | 1455 +++++++-------
 po/ja.po          | 1455 +++++++-------
 po/kn.po          | 1668 ++++++++-------
 po/ko.po          | 1659 ++++++++--------
 po/lt.po          | 1928 +++++++++---------
 po/lv.po          | 1473 +++++++-------
 po/mk.po          | 1644 ++++++++--------
 po/ml.po          | 2561 +++++++++++++-----------
 po/mr.po          | 1608 ++++++++-------
 po/ms.po          | 2878 +++++++++++++++-----------
 po/nb.po          | 1474 +++++++-------
 po/ne.po          | 1661 ++++++++--------
 po/nl.po          | 1991 ++++++++++---------
 po/oc.po          | 1550 +++++++-------
 po/or.po          | 1523 +++++++-------
 po/pa.po          | 1495 +++++++-------
 po/pl.po          | 1428 +++++++-------
 po/pt.po          | 1637 +++++++--------
 po/pt_BR.po       | 1518 +++++++-------
 po/ro.po          | 2133 ++++++++++----------
 po/ru.po          |  925 ++++-----
 po/rw.po          | 1837 +++++++++--------
 po/sk.po          | 2744 ++++++++++++++-----------
 po/sl.po          | 5989 ++++++++++++++++++++++++++---------------------------
 po/sq.po          | 2426 +++++++++++-----------
 po/sr.po          | 2109 +++++++++++--------
 po/sr Latn po     | 2158 +++++++++++--------
 po/sv.po          | 1589 +++++++--------
 po/ta.po          | 1670 +++++++--------
 po/te.po          | 1611 +++++++--------
 po/th.po          | 2071 +++++++++++--------
 po/tr.po          | 1441 +++++++-------
 po/uk.po          | 1964 +++++++++---------
 po/zh_CN.po       | 1447 +++++++-------
 po/zh_HK.po       | 1526 +++++++-------
 po/zh_TW.po       | 1427 +++++++-------
 65 files changed, 61312 insertions(+), 58177 deletions(-)
---
diff --git a/po/am.po b/po/am.po
index 7ff78f6..8c9425a 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-23 21:50-0400\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-02-03 10:13+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales geez org>\n"
 "Language-Team: Amharic <locales geez org>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,698 +27,817 @@ msgstr "%s URL ተቀብሏል\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr ""
 
-#: lib/cache.c:136 lib/local.c:532
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr ""
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:289 lib/misc.c:295 lib/rfc2068.c:263 lib/sshv2.c:993
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr ""
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 ""
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr ""
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: lib/config_file.c:442
+#: 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 ""
 
-#: lib/config_file.c:445
+#: 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:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr ""
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:763
+#: lib/config_file.c:733
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: 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 ""
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 #, fuzzy
 msgid "<unknown>"
 msgstr "ያልታወቀ"
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
+#: lib/fsp.c:189
+#, c-format
+msgid "Error: Cannot upload file %s\n"
 msgstr ""
 
-#: lib/local.c:67 lib/local.c:462
+#: lib/fsp.c:199
 #, c-format
-msgid "Could not change local directory to %s: %s\n"
+msgid "Error: Cannot write to file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:81 lib/local.c:448
+#: lib/fsp.c:237
 #, c-format
-msgid "Could not get current working directory: %s\n"
+msgid "Error: Error closing file: %s\n"
 msgstr ""
 
-#: lib/local.c:179
+#: lib/fsp.c:327
 #, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
 msgstr ""
 
-#: lib/local.c:405
+#: 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 "ያልታወቀ"
+
+#: lib/fsp.c:377
 #, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr ""
 
-#: lib/local.c:442
+#: lib/fsp.c:436
 #, c-format
-msgid "Successfully changed local directory to %s\n"
+msgid "Successfully changed directory to %s\n"
+msgstr ""
+
+#: lib/fsp.c:446
+#, c-format
+msgid "Could not change directory to %s\n"
 msgstr ""
 
-#: lib/local.c:479 lib/local.c:502 src/gtk/transfer.c:907
-#: src/gtk/view_dialog.c:301
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr ""
 
-#: lib/local.c:485
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr ""
 
-#: lib/local.c:508 src/gtk/transfer.c:911 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:525
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr ""
 
-#: lib/local.c:551
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: lib/local.c:558
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/local.c:581
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
+msgid "Could not get current working directory: %s\n"
 msgstr ""
 
-#: lib/local.c:588
+#: lib/local.c:105
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Successfully changed local directory to %s\n"
 msgstr ""
 
-#: lib/local.c:680
-msgid "local filesystem"
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:258 lib/misc.c:265 lib/protocols.c:2488
+#: lib/local.c:238
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:275 lib/protocols.c:2206 lib/sslcommon.c:467
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:283 lib/protocols.c:2136 lib/sslcommon.c:421
+#: lib/local.c:634
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
+msgid "Successfully changed mode of %s to %o\n"
 msgstr ""
 
-#: lib/misc.c:371
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/local.c:641
+#, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr ""
+
+#: lib/local.c:676
+#, c-format
+msgid "Successfully changed the time stamp of %s\n"
 msgstr ""
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/local.c:683
+#, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr ""
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr ""
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr ""
+
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ምንም"
 
-#: lib/options.h:24
+#: lib/options.h:25
 #, fuzzy
 msgid "file"
 msgstr "/ፋይል (_F)"
 
-#: lib/options.h:24
+#: lib/options.h:26
 #, fuzzy
 msgid "size"
 msgstr "መጠን"
 
-#: lib/options.h:25
+#: lib/options.h:26
 #, fuzzy
 msgid "user"
 msgstr "ተጠቃሚ"
 
-#: lib/options.h:25
+#: lib/options.h:27
 #, fuzzy
 msgid "group"
 msgstr "መድረክ"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr ""
 
-#: lib/options.h:38
+#: 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:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr ""
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr ""
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr ""
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr ""
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr ""
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr ""
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr ""
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
 msgstr ""
 
-#: lib/options.h:75
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr ""
+
+#: lib/options.h:85
+msgid "Preserve file times of transferred files"
+msgstr ""
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr ""
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+msgid "Refresh the listbox after each file is transferred"
 msgstr ""
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr ""
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr ""
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1041
-#: src/gtk/options_dialog.c:1134
+#: lib/options.h:100
+msgid "Show transfer status in title"
+msgstr ""
+
+#: lib/options.h:102
+msgid "Show the file transfer status in the titlebar"
+msgstr ""
+
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr ""
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr ""
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "መረብ"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: lib/options.h:94
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:111
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr ""
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: lib/options.h:135
+#: 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 ""
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr ""
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 #, fuzzy
 msgid "HTTPS"
 msgstr "HTTP"
 
-#: lib/options.h:210
+#: lib/options.h:270
 #, fuzzy
 msgid "Local"
 msgstr "/ቅርብ (_L)"
 
-#: lib/options.h:211
+#: lib/options.h:272
 #, fuzzy
 msgid "SSH2"
 msgstr "SSH"
 
-#: lib/options.h:212 src/gtk/bookmarks.c:854
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 #, fuzzy
 msgid "Bookmark"
 msgstr "መለያ ምልክቶች"
 
-#: lib/protocols.c:168 lib/protocols.c:192
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:321
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:466
+#: lib/protocols.c:390
 #, c-format
-msgid "Error: Cannot write to cache: %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:497
+#: lib/protocols.c:400
 #, c-format
-msgid "Error: Could not find bookmark %s\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:504
+#: lib/protocols.c:450
 #, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:602
+#: lib/protocols.c:481
 #, c-format
-msgid "The protocol '%s' is currently not supported.\n"
+msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: lib/protocols.c:919 lib/protocols.c:934 lib/protocols.c:1737
-#: lib/protocols.c:1846
+#: lib/protocols.c:514
 #, c-format
-msgid "Looking up %s\n"
+msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: lib/protocols.c:925 lib/protocols.c:940 lib/protocols.c:1742
-#: lib/protocols.c:1851
+#: lib/protocols.c:521
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1184 lib/protocols.c:1185 lib/protocols.c:1244
-#: lib/protocols.c:1251 lib/protocols.c:1330 lib/protocols.c:1331
-#: lib/protocols.c:1365
-msgid "unknown"
-msgstr "ያልታወቀ"
-
-#: lib/protocols.c:1760 lib/protocols.c:1803 lib/rfc959.c:589 lib/rfc959.c:736
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:1766 lib/protocols.c:1865
+#: lib/protocols.c:1153
 #, c-format
-msgid "Trying %s:%d\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: lib/protocols.c:1771 lib/protocols.c:1872
+#: lib/protocols.c:1531
 #, c-format
-msgid "Cannot connect to %s: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: lib/protocols.c:1827 lib/sshv2.c:891
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:1889 lib/protocols.c:2497 lib/rfc959.c:598 lib/rfc959.c:745
+#: lib/protocols.c:1634 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 ""
 
-#: lib/protocols.c:1896
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr ""
-
-#: lib/protocols.c:2116 lib/protocols.c:2186
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: lib/protocols.c:2254
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2268
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2394
+#: lib/pty.c:301
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: lib/protocols.c:2402
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: lib/pty.c:271
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/pty.c:290 lib/pty.c:347
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/pty.c:303 lib/pty.c:358
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/pty.c:321
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr ""
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
@@ -729,106 +849,90 @@ msgstr "HTTP/1.1ን ተጠቀም"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:988
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr ""
-
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1073
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "የተለየ"
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -839,11 +943,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -853,11 +969,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -865,78 +981,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr ""
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
 msgstr ""
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:756
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1419
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "አጠቃላይ"
 
-#: lib/rfc959.c:1421
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -957,206 +1139,191 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr ""
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr ""
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
-msgstr ""
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "ሚስጢራዊ ቃል፦"
 
-#: lib/sshv2.c:303 lib/sshv2.c:328
-msgid "WARNING"
-msgstr "ማስጠንቀቂያ"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "ሚስጢራዊ ቃል፦"
 
-#: lib/sshv2.c:370
-msgid "Error: An incorrect password was entered\n"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
 
-#: lib/sshv2.c:373
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
 
-#: lib/sshv2.c:376
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: lib/sshv2.c:415
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:421
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:430
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:435
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:441
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:446
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:450
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:455
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:460
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:465
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:470
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:474
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:491
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:496
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:509 src/gtk/bookmarks.c:1013 src/gtk/bookmarks.c:1250
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1099
-#: src/gtk/options_dialog.c:1301 src/gtk/transfer.c:2041
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "እሺ"
 
-#: lib/sshv2.c:512
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr ""
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr ""
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: lib/sshv2.c:573
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:631 lib/sshv2.c:1112 lib/sshv2.c:1949 lib/sshv2.c:2042
-#: lib/sshv2.c:2130
+#: 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 ""
 
-#: lib/sshv2.c:637
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:710 lib/sshv2.c:723 lib/sshv2.c:745 lib/sshv2.c:813
-#: lib/sshv2.c:944 lib/sshv2.c:1035 lib/sshv2.c:1103 lib/sshv2.c:1216
-#: lib/sshv2.c:1229 lib/sshv2.c:1242 lib/sshv2.c:1255 lib/sshv2.c:1311
-#: lib/sshv2.c:1376 lib/sshv2.c:1838 lib/sshv2.c:1940 lib/sshv2.c:2033
-#: lib/sshv2.c:2118 lib/sshv2.c:2203
-msgid "Received wrong response from server, disconnecting\n"
-msgstr ""
-
-#: lib/sshv2.c:862
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: lib/sshv2.c:955
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
@@ -1181,7 +1348,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1190,1460 +1361,1526 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:37 src/gtk/gftp-gtk.c:902 src/gtk/menu-items.c:66
-#: src/gtk/menu-items.c:96 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr ""
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "ተርጓሚ"
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr "ስለ"
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr ""
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr "ascii"
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr "binary"
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr "ሲዲ"
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr "chmod"
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "ሰርዝ"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr ""
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr "ዝጋ"
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr "አጥፉ"
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr "get"
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr "መረጃ"
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr ""
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr "lcd"
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr "lchdir"
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr "lchmod"
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr "ldelete"
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr "lmkdir"
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr "lpwd"
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr "lrename"
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr "lrmdir"
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr "ls"
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr "mget"
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr "mkdir"
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr "mput"
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr "ክፈት"
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr "put"
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr "pwd"
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr "ውጣ"
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr ""
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr "እንደገና ሰይም"
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr "አድርግ"
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:38
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:64
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:128 src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "መለያ ምልክት ጨምር"
 
-#: src/gtk/bookmarks.c:135
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr ""
 
-#: src/gtk/bookmarks.c:465 src/gtk/bookmarks.c:475
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
+msgstr ""
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "አዲስ ዶሴ"
 
-#: src/gtk/bookmarks.c:466
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:476
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/ፋይል/አዲስ ዕቃ..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:549
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 
-#: src/gtk/bookmarks.c:550
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "መለያ ምልክትን ያስተካክሉ"
 
-#: src/gtk/bookmarks.c:577
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "መለያ ምልክቶች"
 
-#: src/gtk/bookmarks.c:819 src/gtk/bookmarks.c:822
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
-#: src/gtk/bookmarks.c:859
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "መግለጫ፦"
 
-#: src/gtk/bookmarks.c:874
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "የእንግዳ ተቀባይ ስም፦"
 
-#: src/gtk/bookmarks.c:887
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "ፖርት፦"
 
-#: src/gtk/bookmarks.c:904
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:928
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:941
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:958
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "የተጠቃሚ ስም፦"
 
-#: src/gtk/bookmarks.c:971
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/gtk/bookmarks.c:985
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:999
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1025 src/gtk/bookmarks.c:1260
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1110
-#: src/gtk/options_dialog.c:1312 src/gtk/transfer.c:2053
-msgid "  Cancel  "
-msgstr "  ተወው  "
-
-#: src/gtk/bookmarks.c:1035 src/gtk/options_dialog.c:1323
-msgid "Apply"
-msgstr "ተጠቀም"
-
-#: src/gtk/bookmarks.c:1177
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ፋይል (_F)"
 
-#: src/gtk/bookmarks.c:1178
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1179
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/ፋይል/አዲስ ዶሴ..."
 
-#: src/gtk/bookmarks.c:1180
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/ፋይል/አዲስ ዕቃ..."
 
-#: src/gtk/bookmarks.c:1181
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/ፋይል/አጥፉ"
 
-#: src/gtk/bookmarks.c:1182
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/ፋይል/ምርጫዎች..."
 
-#: src/gtk/bookmarks.c:1183
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ፋይል/sep"
 
-#: src/gtk/bookmarks.c:1184
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/ፋይል/ዝጋ"
 
-#: src/gtk/bookmarks.c:1195 src/gtk/bookmarks.c:1198
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "መለያ ምልክቶች ያስተካክሉ"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:90
-#: src/gtk/menu-items.c:430 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:533
-msgid "Operation canceled\n"
-msgstr ""
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "የተለየ"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:590
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ተጠቃሚ"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "አንብብ"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "ጻፈ"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "አስኪድ"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:591
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "መድረክ"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "ሌላ"
 
-#: src/gtk/delete_dialog.c:157
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:159
+#: src/gtk/delete_dialog.c:65
+#, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:69
+#, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:177 src/gtk/options_dialog.c:1184
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr ""
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "አገናኝ"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ውጣ"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:159
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "ምርጫዎች"
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:161
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/መስኮት 1"
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/መስኮት 2"
 
-#: src/gtk/gftp-gtk.c:163 src/gtk/gftp-gtk.c:166 src/gtk/gftp-gtk.c:169
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:164
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:167
-msgid "/FTP/_Options..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/ፋይል/ምርጫዎች..."
 
-#: src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ቅርብ (_L)"
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:173
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:175 src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:176
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "ሁሉንም ምረጡ"
 
-#: src/gtk/gftp-gtk.c:179
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:184
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+msgid "/Local/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/ፋይል/አዲስ ዶሴ..."
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Delete..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
+msgstr "/ፋይል/አጥፉ"
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "በድጋሚ ጀምር"
 
-#: src/gtk/gftp-gtk.c:192
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/የራቀ (_R)"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:194
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:196
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:198 src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:199
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "ሁሉንም ምረጡ"
 
-#: src/gtk/gftp-gtk.c:202
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:207
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/ፋይል/አዲስ ዶሴ..."
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Delete..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
+msgstr "/ፋይል/አጥፉ"
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "በድጋሚ ጀምር"
 
-#: src/gtk/gftp-gtk.c:215
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "መለያ ምልክቶች"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:217
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/መለያ ምልክቶች/መለያ ምልክት ጨምር"
 
-#: src/gtk/gftp-gtk.c:219
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/መለያ ምልክቶች/መለያ ምልክቶች ያስተካክሉ"
 
-#: src/gtk/gftp-gtk.c:220
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/መለያ ምልክቶች/sep"
 
-#: src/gtk/gftp-gtk.c:221
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+msgid "/Transfer/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/Start Transfer"
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Stop Transfer"
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:226 src/gtk/gftp-gtk.c:234
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:227
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:230
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+msgid "/Log/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/View log..."
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/መሣሪያዎች (_S)"
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/መረጃ (_H)"
 
-#: src/gtk/gftp-gtk.c:247
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/መረጃ/ስለ..."
 
-#: src/gtk/gftp-gtk.c:357
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "እንግዳ ተቀባይ፦ "
 
-#: src/gtk/gftp-gtk.c:375
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "ፖርት፦ "
 
-#: src/gtk/gftp-gtk.c:393
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "ተጠቃሚ፦ "
 
-#: src/gtk/gftp-gtk.c:411
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "ሚስጢራዊ ቃል፦ "
 
-#: src/gtk/gftp-gtk.c:588 src/gtk/gftp-gtk.c:792 src/gtk/transfer.c:1882
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "የፋይል ስም"
 
-#: src/gtk/gftp-gtk.c:589
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "መጠን"
 
-#: src/gtk/gftp-gtk.c:592
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "ቀን"
 
-#: src/gtk/gftp-gtk.c:593
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:793
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ይሻሻል"
 
-#: src/gtk/gftp-gtk.c:903 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
-msgid "Connect"
-msgstr "አገናኝ"
-
-#: src/gtk/gftp-gtk.c:925
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1160
-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";
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "በድጋሚ ጀምር"
+
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "የተጠቃሚ ስም፦"
+
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1162 src/text/gftp-text.c:150
-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"
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
+msgstr ""
+
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
+msgstr ""
+
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/menu-items.c:75 src/gtk/menu-items.c:105
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
 msgstr ""
 
-#: src/gtk/menu-items.c:127
-msgid "Connect via URL"
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "እንደገና ሰይም"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/menu-items.c:127
-msgid "Enter ftp url to connect to"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/menu-items.c:160
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/menu-items.c:197 src/gtk/menu-items.c:200
-msgid "Change Filespec"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/menu-items.c:200
-msgid "Enter the new file specification"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:228 src/gtk/menu-items.c:600 src/gtk/menu-items.c:658
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: 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/menu-items.c:254
-msgid "Save Directory Listing"
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
 msgstr ""
 
-#: src/gtk/menu-items.c:371
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "በላዩ ላይ ይጻፍ"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "ቀጥል"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "ዝለል"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "ትግባር"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:390 src/gtk/menu-items.c:393
-msgid "Site"
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
 
-#: src/gtk/menu-items.c:393
-msgid "Enter site-specific command"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
 msgstr ""
 
-#: src/gtk/menu-items.c:492 src/gtk/menu-items.c:526
-msgid "Chdir"
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "ሁሉንም ምረጡ"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr ""
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:624 src/gtk/menu-items.c:682
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
+msgstr ""
+
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
+msgstr ""
+
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
+msgstr ""
+
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:693
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:705
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: src/gtk/menu-items.c:741
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: src/gtk/menu-items.c:745 src/gtk/menu-items.c:750
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "ስለ gFTP"
 
-#: src/gtk/menu-items.c:781
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:782 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "ተርጓሚ"
-
-#: src/gtk/menu-items.c:793
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "ስለ"
 
-#: src/gtk/menu-items.c:842
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr ""
 
-#: src/gtk/menu-items.c:848 src/gtk/view_dialog.c:377
-msgid "  Close  "
-msgstr "  ዝጋ  "
-
-#: src/gtk/menu-items.c:930
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "በድጋሚ ጀምር"
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
+msgstr ""
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "ተገናኝቷል አይደለም"
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "ለውጥ"
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "እንደገና ሰይም"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1170
-msgid "Add"
-msgstr "ጨምር"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "ተወው"
-
-#: src/gtk/misc-gtk.c:1053
-msgid "  Yes  "
-msgstr "  አዎ  "
-
-#: src/gtk/misc-gtk.c:1063
-msgid "  No  "
-msgstr "  አይ  "
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "አቁም"
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:100
-msgid "Mkdir"
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Make Directory"
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Enter name of directory to create"
-msgstr ""
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
+msgstr "ዶሜን"
 
-#: src/gtk/options_dialog.c:910
-msgid "Edit Host"
+#: src/gtk/options_dialog.c:978
+msgid "_Network address:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:910
-msgid "Add Host"
+#: src/gtk/options_dialog.c:1013
+msgid "N_etmask:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:942 src/gtk/options_dialog.c:1033
-msgid "Domain"
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
 msgstr "ዶሜን"
 
-#: src/gtk/options_dialog.c:962
-msgid "Network Address"
-msgstr ""
-
-#: src/gtk/options_dialog.c:995 src/gtk/options_dialog.c:1135
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1141
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1177 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "አስተካክል"
-
-#: src/gtk/options_dialog.c:1239 src/gtk/options_dialog.c:1244
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ምርጫዎች"
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/rename_dialog.c:111
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr ""
-
-#: src/gtk/transfer.c:166
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: src/gtk/transfer.c:282
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr ""
-
-#: src/gtk/transfer.c:309 src/gtk/transfer.c:1285
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr ""
 
-#: src/gtk/transfer.c:319 src/gtk/transfer.c:1179 src/gtk/transfer.c:1190
-msgid "Enter Password"
-msgstr "ሚስጢራዊ ቃል አስገቡ"
-
-#: src/gtk/transfer.c:320 src/gtk/transfer.c:1180 src/gtk/transfer.c:1191
-msgid "Please enter your password for this site"
-msgstr ""
-
-#: src/gtk/transfer.c:410
-msgid "Transfer Files"
-msgstr ""
-
-#: src/gtk/transfer.c:418
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/transfer.c:645
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-
-#: src/gtk/transfer.c:702
-#, c-format
-msgid "Could not download %s from %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:732
+#: src/gtk/transfer.c:336
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:1071 src/gtk/transfer.c:1157
-#: src/gtk/transfer.c:1595
-msgid "Skipped"
-msgstr ""
-
-#: src/gtk/transfer.c:841 src/gtk/transfer.c:1133 src/gtk/transfer.c:1161
-msgid "Waiting..."
+msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:984
+#: src/gtk/transfer.c:345
 #, c-format
-msgid "Error: Child %d returned %d\n"
+msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/gtk/transfer.c:987
+#: src/gtk/transfer.c:352
 #, c-format
-msgid "Child %d returned successfully\n"
+msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: src/gtk/transfer.c:999
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1007
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr ""
 
-#: src/gtk/transfer.c:1010
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ፋይል ያስተካክሉ"
 
-#: src/gtk/transfer.c:1074
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ጨርሷል"
 
-#: src/gtk/transfer.c:1114
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1326
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1354
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1363
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1389
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr ""
-
-#: src/gtk/transfer.c:1467 src/gtk/transfer.c:1489 src/gtk/transfer.c:1523
-#: src/gtk/transfer.c:1563 src/gtk/transfer.c:1616 src/gtk/transfer.c:1675
-msgid "There are no file transfers selected\n"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1507
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1548 src/gtk/transfer.c:1601
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1762 src/gtk/transfer.c:1967 src/gtk/transfer.c:2006
-msgid "Overwrite"
-msgstr "በላዩ ላይ ይጻፍ"
-
-#: src/gtk/transfer.c:1784 src/gtk/transfer.c:1977 src/gtk/transfer.c:2012
-msgid "Resume"
-msgstr "ቀጥል"
-
-#: src/gtk/transfer.c:1806 src/gtk/transfer.c:1972
-msgid "Skip"
-msgstr "ዝለል"
-
-#: src/gtk/transfer.c:1883
-msgid "Local Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1884
-msgid "Remote Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1885
-msgid "Action"
-msgstr "ትግባር"
-
-#: src/gtk/transfer.c:1887
-msgid "Download Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1887
-msgid "Upload Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1913
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-
-#: src/gtk/transfer.c:2018
-msgid "Skip File"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/gtk/transfer.c:2028
-msgid "Select All"
-msgstr "ሁሉንም ምረጡ"
-
-#: src/gtk/transfer.c:2034
-msgid "Deselect All"
+#: 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 ""
 
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "ተመልከት"
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "አስተካክል"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr "ስለ"
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr ""
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr "ascii"
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr "binary"
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr "ሲዲ"
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr "chdir"
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr "chmod"
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr "ሰርዝ"
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr ""
-
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr "ዝጋ"
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr "አጥፉ"
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr "get"
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr "መረጃ"
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr ""
-
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr "lcd"
-
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr "lchdir"
-
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr "lchmod"
-
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr "ldelete"
-
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr "lls"
-
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr "lmkdir"
-
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr "lpwd"
-
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr "lrename"
-
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr "lrmdir"
-
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr "ls"
-
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr "mget"
-
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr "mkdir"
-
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr "mput"
-
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr "ክፈት"
-
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr "put"
-
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr "pwd"
-
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr "ውጣ"
-
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr ""
-
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr "እንደገና ሰይም"
-
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:89
-msgid "set"
-msgstr "አድርግ"
-
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-
-#: src/text/gftp-text.c:148
-msgid ""
-">.\n"
-"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 ""
-
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr ""
-
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:698
-#: src/text/gftp-text.c:716 src/text/gftp-text.c:737 src/text/gftp-text.c:811
-msgid "Error: Not connected to a remote site\n"
-msgstr ""
-
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:744
-msgid "usage: mget <filespec>\n"
+#: src/text/gftp-text.c:166
+#, c-format
+msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:818
-msgid "usage: mput <filespec>\n"
-msgstr ""
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "የተጠቃሚ ስም፦"
 
-#: src/text/gftp-text.c:956
+#: src/text/textui.c:158
 #, c-format
-msgid "Could not download %s\n"
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
-#: src/text/gftp-text.c:963
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr ""
+#~ msgid "WARNING"
+#~ msgstr "ማስጠንቀቂያ"
 
-#: src/text/gftp-text.c:1030
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
+#~ msgid "  Cancel  "
+#~ msgstr "  ተወው  "
 
-#: src/text/gftp-text.c:1086
-msgid "usage: set [variable = value]\n"
-msgstr ""
+#~ msgid "Apply"
+#~ msgstr "ተጠቀም"
 
-#: src/text/gftp-text.c:1100
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr ""
+#~ msgid "  Close  "
+#~ msgstr "  ዝጋ  "
 
-#: src/text/gftp-text.c:1107
-#, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr ""
+#~ msgid "Add"
+#~ msgstr "ጨምር"
 
-#: src/text/gftp-text.c:1135
-msgid "Invalid argument\n"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "ተወው"
 
-#: src/text/gftp-text.c:1160
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr ""
+#~ msgid "  Yes  "
+#~ msgstr "  አዎ  "
 
-#: src/text/gftp-text.c:1238
-msgid "Clear the directory cache\n"
-msgstr ""
+#~ msgid "  No  "
+#~ msgstr "  አይ  "
 
 #~ msgid "gFTP Icon"
 #~ msgstr "gFTP ምልክት"
diff --git a/po/ar.po b/po/ar.po
index ebf1eac..4bdfea1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-31 11:06+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-05-02 22:32+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny eglug org>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,151 +20,150 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, fuzzy, c-format
 msgid "Invalid URL %s\n"
 msgstr "handler عنوان غير صالح"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "خطأ :سطر غير صحيح%sفى ملف فهرس الكاش\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, 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
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "خطأ:لا يمكننى فتح مجلد محلى %s%s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:496
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "خطأ تعذر فى الكتابة الى المقبس %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:449
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "خطأ تعذر فى القراءة من المقبس %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌ :اسم سيىء لملف علامة الموقع %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "تحذير جي‌إف‌تي‌بي‌ :تعذر ايجاد ملف علامة الموقع الرئيسى %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌ :تعذر فتح ملف علامة الموقع %s%s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "تحذير جي‌إف‌تي‌بي‌ :حدف سطر من %d ملف علامة الموقع %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "تحذير جي‌إف‌تي‌بي‌ :السطر لا يملك %d التعبيرات الكافية \n"
 
-#: ../lib/config_file.c:504
+#: 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 ""
 
-#: ../lib/config_file.c:507
+#: 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:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌ : اعداد سيىءلاءسم الملف %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌:لا يمكن تكوين مجلد%s%s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌ :لا يمكن ايجاد اعدادات الملف الرئسية  %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "هل تريد ان تقوم بالتنصيب ؟\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌:لايمكن فتح ملف الاعدادات %s %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "تحدير جي‌إف‌تي‌بي‌ :الغاء سطر %d فى ملف الاعدادات %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌ :اسم سيىء لملف الدخول %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "تحذير جي‌إف‌تي‌بي‌ :لايمكن %sالفتح للكتابة %s\n"
 
-#: ../lib/config_file.c:732
+#: 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 ""
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -171,219 +171,216 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:845
+#: 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 ""
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<مجهول>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, fuzzy, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "لا يمكن إيجاد ملف رقم  '%s'"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, fuzzy, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "تعذّر الكتابة في ملف BMP "
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, fuzzy, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "خطأ غلق ملف الجلسة '%s': %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, fuzzy, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "تعذر قبول الاتصال بالملقم%s\n"
 
-#: ../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
+#: 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 "مجهول "
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, fuzzy, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "تعذر ايجاد لائحة الملفات المحلية %s%s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, fuzzy, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "فشلت اضافة دليل."
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, fuzzy, c-format
 msgid "Could not change directory to %s\n"
 msgstr "لم يمكن إعادة تسمية المجلّد %s إلى %s: %s"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "تمت ازالته بنجاح%s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "خطأ تعذر فى ازالة الملف %s %s \n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "تعذر مجلد العمل الحالى %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "تم بنجاح تحويل الملف المحلى الى%s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "تعذر تغيير المجلد المحلى الى %s%s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "خطأ تعذر الاقتطاع من الملف المحلى %s%s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "تعذر ايجاد لائحة الملفات المحلية %s%s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, fuzzy, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "التحول إلى الوضع دون اتصال بالإنترنت"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, fuzzy, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 "لم يمكن تغيير قيمة المفتاح. رسالة الخطأ:\n"
 "%s"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, fuzzy, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "تم بنجاح تحويل الملف المحلى الى%s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, fuzzy, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr ""
 "لم يمكن تغيير قيمة المفتاح. رسالة الخطأ:\n"
 "%s"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ملف نظام محلى "
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "جي‌إف‌تي‌بي‌ إستخدام"
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "لاشىء"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ملف"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "حجم"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "user"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "group"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 #, fuzzy
 msgid "datetime"
 msgstr "دالات التاريخ و الساعة"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 #, fuzzy
 msgid "attribs"
 msgstr "المدخلات "
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "تنازليا"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "تصاعديا"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "عام"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "اظهر البرنامج"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -391,234 +388,235 @@ msgstr ""
 "البرنامج الافتراضى هو المستخدم لاظهار الملفات :فاءذا كان هذا فارغ فالمكمل "
 "الداخلى سيتم استخدامه"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "اعداد:البرنامج:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "البرنامج الافتراضى المستخدم لتحرير الملفات"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "الحجم الاقصى لنافدة الدخول :"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "الحجم الاقصى لنافدة الدخول بالبيتات لمنفد GTK"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 #, fuzzy
 msgid "Remote Character Sets:"
 msgstr "قائمة مجموعات الرموز المدعومة"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 #, fuzzy
 msgid "Remote LC_TIME:"
 msgstr "الوقت الذي تحدّده أنت"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "عدد الثوانى للانتظار بين المحاولات "
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "اكتب محولات الملفات "
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "اعد كتابة ملف "
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "لا تقم بالتحويل فى الوقت "
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "قم باجراء تحويل واحد كل مرة "
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "اعادة الكتابة الافتراضية "
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "اعادة كتابة الملفات الافتراضية او قم باعداد ملف معاودة التحويل "
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 #, fuzzy
 msgid "Preserve file permissions"
 msgstr "تصاريح الملف، بتمثيل ثماني."
 
-#: ../lib/options.h:80
+#: lib/options.h:80
 #, fuzzy
-msgid "Preserve file permissions of transfered files"
+msgid "Preserve file permissions of transferred files"
 msgstr "تغير تصريح الملف البعيد"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 #, fuzzy
 msgid "Preserve file time"
 msgstr "الوقت الذي تحدّده أنت"
 
-#: ../lib/options.h:85
+#: lib/options.h:85
 #, fuzzy
-msgid "Preserve file times of transfered files"
+msgid "Preserve file times of transferred files"
 msgstr "تغير تصريح الملف البعيد"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "قم بالنعاش عند تحويل كل ملف "
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "قم بانعاش مربع السرد فى كل مرة تقوم بها بالتحويل "
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ادرج المجلدات اولا "
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "ضع المجلدات اولا ثم الملفات "
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "اظهر الملفات المخفية"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "اظهار الملفات المخفية برمبعات السرد "
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 #, fuzzy
 msgid "Show transfer status in title"
 msgstr "اعرض  شريط الحالة في النوافذ الجديدة"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 #, fuzzy
 msgid "Show the file transfer status in the titlebar"
 msgstr "اظهار الملفات المخفية برمبعات السرد "
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ابداء بتحويل الملف "
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 #, fuzzy
 msgid "Automatically start the file transfers when they get queued"
 msgstr "القيام بتحويل الملفات ذاتيا بمجرد الحصول على الاستعلام "
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "أسمح بالأوامر اليدوية فى واجهة المستخدم الرسومية"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 #, fuzzy
 msgid "Remember last directory"
 msgstr "تصدير بصيغة HTML لآخر مجلد"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 #, fuzzy
 msgid "Connect to remote server on startup"
 msgstr "الإتصال بخادم عن بعد"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "الشبكة "
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "نفاذ الوقت بالشبكة "
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "نفاد الوقت عند انتظار مدخلات /مخرجات الشبكة "
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "اعادة الاتصال "
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 #, fuzzy
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "عدد العادات الذاتية ....ضعها 0 لمعرف الاعادات "
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "وقت انتظار الاعادة "
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "عدد الثوانى للانتظار بين المحاولات "
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "الحد الاقصى للكب/ث"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "الحد الاقصى من كب/ث التى يستطيع ناقل الملفات ان يتحصل عليها (ضع قيمتها 0 "
 "لتعطيلها)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 #, fuzzy
 msgid "Transfer Block Size:"
 msgstr "_حجم خط داشر"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "البروتوكول الأفتراضى"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "تحديد البروتكول الافتراضى للاستخدام "
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 #, fuzzy
 msgid "Enable IPv6 support"
 msgstr "_تفعيل دعم الفيديو"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -626,42 +624,42 @@ msgstr ""
 "هذا سوف يعرف ماذا سيحدث عند النقر المزدوج لملف فى مربع سرد الملفات:0=عرض "
 "الملف 1=تحرير الملف 2=تحويل الملف "
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "العرض الافتراضى لمربع سرد الملفات المحلى "
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "العرض الافتراضى لمربع سرد الملفات البعيد"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "الارتفاع الافتراضى لمربعات سرد الملفات المحلية/البعيدة"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "الارتفاع الافتراضى لمربع سرد التحويل "
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "الارتفاع الافتراضى لنافدة الدخول "
 
-#: ../lib/options.h:177
+#: 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 ليتم تحجيم العمود ذاتيا "
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "العمود الافتراضى للاءدراج ب"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "رتبهم تصاعدياً او تنازلياً"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -669,7 +667,7 @@ msgstr ""
 "عرض عمود اسم الملف فى مربعات سرد الملفات ضع القيمة 0 لتمكين التحجيم الذاتى "
 "او ضعها 1 لتعطيل العمود "
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -677,7 +675,7 @@ msgstr ""
 "عرض حجم العمود فى مربعات سرد الملفات ضع القيمة 0 لتحجيم العمود ذاتياً او الى "
 "1 لتعطيل العمود"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -685,7 +683,7 @@ msgstr ""
 "عرض عمود المستخدم فى مربعات يرد الملف ضعها 0 لتفعيل التحجيم الذاتى او الى 1 "
 "لتعطيل العمود "
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -693,7 +691,7 @@ msgstr ""
 "عرض عمود المجموعةفى مربعات سرد الملف ضعها 0 لتفعيل التحجيم التلقائى او 1 "
 "لتعطيل العمود"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -701,7 +699,7 @@ msgstr ""
 "عرض عمود البيانات فى مربعات سرد الملف ضعها 0 لتمكين التحجيم التلقائى او 1 "
 "لتعطيل العمود "
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -709,271 +707,271 @@ msgstr ""
 "عرض عمود المميزات فى مربعات سرد الملف ضعها 0 لتمكين التحجيم التلقائى او "
 "1لتعطيل العمود "
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "الوان الأوامر المرسلة الى الملقم "
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "الوان الاوامر المستقبلة من الملقم "
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "الوان رسائل الاخطاء "
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "الالوان الباقية لرسائل الدخول "
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "محلى "
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 #, fuzzy
 msgid "Bookmark"
 msgstr "مؤشّر"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "نقل الملف سيخفف لسرعة %.2fكب/ث\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, fuzzy, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "تحميل قائمة المجلدات %sمن الذاكرة\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, fuzzy, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "تحميل قائمة المجلدات %sمن الذاكرة\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, 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:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "خطأ لا يمكن الكتابة للذاكرة%s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "خطأ :لايمكننى ايجاد علامة الموقع  %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, fuzzy, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "خطأ فى علامة الموقع :هناك بعض المعلومات المفقودة الرجاء التاكد باءن لديك اسم "
 "مستخدم وكلمة مرور\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, fuzzy, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "البروتوكول “%s” غير مدعوم"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, fuzzy, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "فشل قراءة الوصلة الرمزيّة %s: %s"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "خطأ :الموقع البعيد %sفصل بعد الوصول للحد الاقص للمحاولات المعطية له \n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, fuzzy, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "خطأ :الموقع البعيد %sفصل وسيعاد الاتصال عند%sث\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, fuzzy, c-format
 msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr "خطأ :لا يمكننى البحث بالملف %s:%s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "تعذر فى فتح pty الرئيسى%s:%s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "فشل فى تكوين ازواج المقبس %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "خطأ لايمكن تنفيد shh%s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "تعذر فى التحول لعمليات اخرى%s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "بروكسى المضيف "
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "الحاجز النارى للمضيف "
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "منفد البروكسى "
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "المنفد للاتصال به عند حاجز النار "
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "بروكسى المستخدم "
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "حاجزك النارى و اسمك "
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "كلمة العبور للبروكسى "
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "كلمة العبور لحاجزك النارى "
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "استخدم :HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "قطع الاتصال:استقبال استجابة خاطئة من الملقم \n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 #, fuzzy
 msgid "Starting the file transfer at offset "
 msgstr "البدء بنقل الملف بالوضع المظبط%ld\n"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "تعذر ايجاد الملف %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "البحث عن قائمة المجلدات.......\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "قطع الاتصال:استقبال استجابة خاطئة من الملقم \n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "اوامر الموقع"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "مستخدم مضيف"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "مستخدم منفد:المضيف"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "التحقق"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "مستخدم @منفد:المضيف"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "مستخدم غيرمصرح له:المضيف"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "بروكسى HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "خيارى"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "عنوان البريد الالكترونى:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "حساب البروكسى "
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "حسابحاجزك النارى (خيارى)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 #, fuzzy
 msgid "Proxy server type:"
 msgstr "توثق من الاتصلات لخادم البروكسي"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -984,12 +982,12 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 #, fuzzy
 msgid "Ignore PASV address"
 msgstr "عنوان البريد الالكتروني للموصول"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -997,11 +995,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "نقل الملف السلبى "
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1011,11 +1009,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "تحليل ارتباطات النظام للجهاز البعيد (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1023,389 +1021,380 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "نقل الملفات فى وضعية أسكى"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, fuzzy, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "إستجابة توثيق رديئة من النّادل."
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, fuzzy, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "فشل إنشاء المجلد “%s”."
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "تعذر ايجاد عنوان IPخلال الاستجابة السلبية'%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, fuzzy, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "تعذر ايجاد عنوان IPخلال الاستجابة السلبية'%s'\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "التعذر فى تكوين اتصال بالبيانات%s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "تعذر الارتباط بالمنفذ%s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, fuzzy, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "فشل إنشاء المجلد “%s”."
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, fuzzy, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "لا داعي للرّد"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, fuzzy, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "فشل فى تكوين ازواج المقبس %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "تعذر قبول الاتصال بالملقم%s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "الكلى"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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 ""
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "تعذر فى الحصول على علامات المقبس%s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "تعذر فى اعداد المقبس لوضع غير-مسدود%s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "اسم برنامج الSHH"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "المسار الى SHH التنفيدى "
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "الاحداثيات الخاصة للSHH"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "الاحداثيات الخاصة للعبور لبرنامج SHH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "مطلوب اسم المستخدم/كلمة العبور للSHH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "مطلوب اسم المستخدم /كلمة العبور لاتصالات SSH "
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "تنفيد برنامج%s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 #, fuzzy
 msgid "Enter passphrase for key '"
 msgstr "توقّعت `%s' تلقّيت `%s' للمفتاح %s"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "كلمة مرور"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "كلمة مرور"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "نعم/لا؟"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE: أدخل"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ادخال كلمة السر "
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 #, fuzzy
 msgid "Enter SecurID Password:"
 msgstr "ادخل كلمة السر لـ %s"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "خطأ :كلمة عبور خاطئةقد تم ادخالها\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d:التحقق من البرتكول \n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%dاصدار البرتكول %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d افتح%s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%dقفل \n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d فتح مجلد%s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d قراءة مجلد\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%dازالة ملف %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%dتكوين مجلد%s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%dازالة مجلد%s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%dالمسار الحقيقى %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d توصيفات الملفات\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%dحالة الملف%s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d تغيير الملكية %s%o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "موافق"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "نهاية الملف"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "لايوجد مثل هذا الملف او المجلد"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "التصريح مطلوب"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "فشل"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "رسالة سيئة"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "لايوجد اتصال "
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "فقد الاتصال "
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "العملية غير مدعومة"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "رسالة مجهولة ارجعت من الملقم "
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "خطأ حجم الرسالة%d كبير جدا \n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "فتح اتصال SHHب%s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "تم الدخول بنجاح الى ملقم SHH%s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "محركSSL "
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 #, fuzzy
 msgid "SSL Entropy File:"
 msgstr "حفظ الملف كـ"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 #, fuzzy
 msgid "SSL entropy file"
 msgstr "حفظ الملف كـ"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 #, fuzzy
 msgid "Entropy Seed Length:"
 msgstr "تجاوز طول المسار"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSLالتأكد من نظير "
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1414,68 +1403,58 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 #, fuzzy
 msgid "Cannot get peer certificate\n"
 msgstr "لا يمكن تلقي ملخّص POP: %s"
 
-#: ../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 "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:305
+#: lib/sslcommon.c:297
 #, fuzzy
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "لا يمكن تشغيل مدير التفضيلات"
 
-#: ../lib/sslcommon.c:320
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:332
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:352 ../lib/sslcommon.c:426 ../lib/sslcommon.c:474
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:379
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:400
+#: lib/sslcommon.c:392
 #, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "خطأ في معدل الإطارات."
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "العملية الغيت \n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 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.جي‌إف‌تي‌بي‌.org   \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 "
@@ -1485,79 +1464,79 @@ msgstr ""
 "يرحب باءعادة توزيع المنتج تحت شروط خاصة ايضا يمكنك الاطلاع عليها فى ملف "
 "الحقوق \n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "ترجم بواسطة اسامة الرواب  alrawab hotmail 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
 #, fuzzy
 msgid "usage: chmod <mode> <file>\n"
 msgstr "نمط التصفية لمتصفح الملفات "
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 #, fuzzy
 msgid "usage: rename <old name> <new name>\n"
 msgstr "الأسم الجديد مساو للاسم القديم."
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 #, fuzzy
 msgid "usage: delete <file>\n"
 msgstr "هل تريد حقاً حذف الملف \"%s\"?"
 
-#: ../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
 #, fuzzy
 msgid "usage: mkdir <new directory>\n"
 msgstr "اضف دليل فارغ جديد"
 
-#: ../src/uicommon/gftpui.c:437 ../src/uicommon/gftpui.c:455
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 #, fuzzy
 msgid "usage: chdir <directory>\n"
 msgstr "ليس دليل مستخدمين صحيح"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 #, fuzzy
 msgid "Invalid argument\n"
 msgstr "متغير غير صحيح: \"%s\"\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "مسح مجلد الذاكرة \n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "الأستخدام : فتح"
 
-#: ../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"
 
-#: ../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 ليس متغير فى نص منفد جي‌إف‌تي‌بي‌ \n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1565,322 +1544,321 @@ msgstr ""
 "الاوامر المدعومة \n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "الأستخدام %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "حول "
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "اظهار معلومات جي‌إف‌تي‌بي‌"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "اسكى"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "حول نمط تحويل الملفات الحالى الى اسكى (فقط للFTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ثنائى"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "حول نمط تحويل الملفات الحالى الى ثنائى (فقط للFTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "فتح"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "تغير مجلد العمل البعيد"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "تغير تصريح الملف البعيد"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "مسح"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "خيارات الذاكرة المتاحة"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "قفل"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "قطع الاتصال بالموقع البعيد"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "حدف"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "حدف الملف البعيد"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "اظهار المجلد المدرج فى المجلد البعيد الحالى "
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "تنزيل ملف(ات) بعيد(ة)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "مساعدة"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "اظهار شاشة المساعدة"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "تغير مجلد العمل المحلى "
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "تغير تصاريح الملف المحلى "
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ازالة ملف محلى "
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "اظهار المجلد المسرد من المجلد المحلى "
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "انشاء مجلد محلى "
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "اظهار المجلد المحلى الحالى "
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "اعادة تسمية الملف  المحلى "
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ازالة المجلد المحلى "
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "انشاء مجلد بعيد"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "تحميل الملف(ات)المحلية"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "فتح"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "فتح الاتصال بالموقع البعيد"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "اظهار المجلد البعيد الحالى "
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "اجهاض "
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "الخروج من جي‌إف‌تي‌بي‌"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "اعادة تسمية "
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "اعادة تسمية الملف البعيد"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ازالة المجلد البعيد"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "اظهار متغيرات اعدادات الملف :بامكانك اعداد المتغيرات بوضع var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 #, fuzzy
 msgid "site"
 msgstr "موقع الإنترنت"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "تشغيل الأمر في الشاشة الطرفية"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "خطأ فشل فى التعرف على الامر \n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "حول بنجاح %sعند %.2fكب/ث\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "الغاء الملف %s من المضيف%s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "ايقاف التحويل من المضيف%s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "لا استطيع انزال %sمن %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s الرجاء ظغط زر التوقف اولا لاءجراء اى شىء اخر\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "تنفيد علامة موقع "
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "اظافة علا مة موقع:يجب ان تحدد اسم لعلامة الموقع \n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "اظافة علامة موقع :فشل فى الاظافة %s لان علامة الموقع موجودة بالفعل \n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "اظافة علامة موقع "
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "اظافة علامة موقع :يجب ان تحدد اسم المظيف\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1890,33 +1868,33 @@ msgstr ""
 "تستطيع ان تفصل العناصر بواسطة /لتضعها فى القائمة \n"
 "(مثلا :مواقع لينكس/ديبيان )"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "تذكر كلمة السر"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 #, fuzzy
 msgid "You must specify a name for the bookmark."
 msgstr "اظافة علا مة موقع:يجب ان تحدد اسم لعلامة الموقع \n"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "مجلد جديد"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "ادخل اسم للمجلد الجديد لتكوينه"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 #, fuzzy
 msgid "New Item"
 msgstr "إضافة مادة جديدة"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "ادخل اسم للعنصر الجديد لتكوينه"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1925,111 +1903,104 @@ msgstr ""
 "هل انت متاءكد باءنك تريد ازالة علامة الموقع\n"
 "%sبكل ملحقاته؟"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ازالة علامة الموقع "
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "علامة الموقع "
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "حرر المدخلات"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "وصف"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "اسم المضيف"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "منفد:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "مراسم :"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "مجلد بعيد:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "مجلد محلى :"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "اسم المستخدم :"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "كلمة عبور :"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "حساب :"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "الدخول بصفة:اى شخص "
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "..الغاء.."
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ملف"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 #, fuzzy
 msgid "/File/New _Folder..."
 msgstr "اسم دليل جديد"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 #, fuzzy
 msgid "/File/New _Item..."
 msgstr "إضافة مادة جديدة"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 #, fuzzy
 msgid "/File/_Delete"
 msgstr "حذف ملف"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 #, fuzzy
 msgid "/File/_Properties..."
 msgstr "تعديل خصائص الملف"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 #, fuzzy
 msgid "/File/_Close"
 msgstr "غلق الملف الحالي"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "حرر علاملت الموقع "
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2037,91 +2008,90 @@ msgstr ""
 "تستطيع الان ان تحدد المدخلات لملفك(اتك)\n"
 "انتبه:ليس كل ملقمات ال ftp تدعم خاصية chmod "
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "خاص"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "لاصق"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "مستخدم "
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "قراءة "
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "كتابة "
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "تنفيد"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "مجموعة "
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "اخرون "
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "هل انت متاءكد بانك تريد حدف%ld هذه الملفات %ld و المجلدات"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, fuzzy, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "هل انت متاءكد بانك تريد حدف%ld هذه الملفات %ld و المجلدات"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, fuzzy, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "هل انت متاءكد بانك تريد حدف%ld هذه الملفات %ld و المجلدات"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "حدف الملفات /المجلدات "
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "حدف"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "اتصال "
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "الرابط المستقبل %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "السحب-و-الافلات "
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "خروج"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2129,526 +2099,513 @@ msgstr ""
 "هناك ملفات يتم نقلها \n"
 " هل انت متاءكد بانك تريد الخروج؟"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 #, fuzzy
 msgid "Open Location"
 msgstr "فتح الموقع"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 #, fuzzy
 msgid "Enter a URL to connect to"
 msgstr "اتصال بالموقع الغير موثوق؟"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "اف.تى.بى"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 #, fuzzy
 msgid "/FTP/Window _1"
 msgstr "مبدل النافذة"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 #, fuzzy
 msgid "/FTP/Window _2"
 msgstr "مبدل النافذة"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 #, fuzzy
 msgid "/FTP/_Ascii"
 msgstr "برو_كسي FTP:"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 #, fuzzy
 msgid "/FTP/_Binary"
 msgstr "أظهر الملفات ال_ثنائية"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 #, fuzzy
 msgid "/FTP/_Preferences..."
 msgstr "خيارات داشر"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/اجهاض"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/محلى "
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 #, fuzzy
 msgid "/Local/_Open Location..."
 msgstr "تعذر فتح اللموقع"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 #, fuzzy
 msgid "/Local/D_isconnect"
 msgstr "المراسلون المحليون"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 #, fuzzy
 msgid "/Local/Change _Filespec..."
 msgstr "تغيير محلي للخط"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 #, fuzzy
 msgid "/Local/_Show selected"
 msgstr "أظهر المؤشر المحدد على شريط الأدوات"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 #, fuzzy
 msgid "/Local/Select _All"
 msgstr "إنتقاء جميع المراسَلين"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/محلى /اختيار كل الملفات"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/محلى /عدم اختيار الكل "
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/محلى/حفظ لائحة المجلدات "
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/محلى/ارسال امر موقع ....."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 #, fuzzy
 msgid "/Local/_Change Directory"
 msgstr "فشل التغيير الى الدليل '%s' (%s)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 #, fuzzy
 msgid "/Local/_Permissions..."
 msgstr "أذون المندوبين"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 #, fuzzy
 msgid "/Local/_New Folder..."
 msgstr "اسم دليل جديد"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 #, fuzzy
 msgid "/Local/Rena_me..."
 msgstr "المراسلون القريبون مني"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 #, fuzzy
 msgid "/Local/_Delete..."
 msgstr "إحذف النص"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 #, fuzzy
 msgid "/Local/_Edit..."
 msgstr "ت_حرير الخط"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 #, fuzzy
 msgid "/Local/_View..."
 msgstr "وضعية _ العرض"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 #, fuzzy
 msgid "/Local/_Refresh"
 msgstr "تحديث القائمة"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/بعيد"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 #, fuzzy
 msgid "/Remote/_Open Location..."
 msgstr "تعذر فتح اللموقع"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 #, fuzzy
 msgid "/Remote/D_isconnect"
 msgstr "مراسَلين بعيدين"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 #, fuzzy
 msgid "/Remote/Change _Filespec..."
 msgstr "غيٌر وضعية الإظهار"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
 msgid "/Remote/_Show selected"
 msgstr "أظهر المؤشر المحدد على شريط الأدوات"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 #, fuzzy
 msgid "/Remote/Select _All"
 msgstr "إنتقاء جميع المراسَلين"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/بعيد/اختيار كل الملفات "
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/بعيد/عدم اختيار الكل "
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/بعيد/حفظ قائمة المجلدات "
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/ بعيد/ارسال امر موقع "
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 #, fuzzy
 msgid "/Remote/_Change Directory"
 msgstr "فشل التغيير الى الدليل '%s' (%s)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 #, fuzzy
 msgid "/Remote/_Permisssions..."
 msgstr "مراسَلين بعيدين"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 #, fuzzy
 msgid "/Remote/_New Folder..."
 msgstr "اسم دليل جديد"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 #, fuzzy
 msgid "/Remote/Rena_me..."
 msgstr "المراسلون القريبون مني"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 #, fuzzy
 msgid "/Remote/_Delete..."
 msgstr "إحذف النص"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 #, fuzzy
 msgid "/Remote/_Edit..."
 msgstr "ت_حرير الخط"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 #, fuzzy
 msgid "/Remote/_View..."
 msgstr "وضعية _ العرض"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 #, fuzzy
 msgid "/Remote/_Refresh"
 msgstr "تحديث القائمة"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/ علامة الموقع "
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bookmarks/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "إضافة مؤشّر للصّفحة الحاليّة"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "_تحرير المؤشّرات"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bookmarks/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 #, fuzzy
 msgid "/_Transfer"
 msgstr "_حوّل المكالمة"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 #, fuzzy
 msgid "/Transfer/tearoff"
 msgstr "/نوافذ/قاطف"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
 msgid "/Transfer/_Start"
 msgstr "إبدأ مخفياً"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 #, fuzzy
 msgid "/Transfer/St_op"
 msgstr "_إيقاف التحريك"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
 msgid "/Transfer/sep"
 msgstr "_حوّل المكالمة"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
 msgid "/Transfer/Skip _Current File"
 msgstr "ايقاف تمرير البيانات الحالي"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
 msgid "/Transfer/_Remove File"
 msgstr "لا يمكن حذف %s: %s\n"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
 msgid "/Transfer/Move File _Up"
 msgstr "نقل ل_مساحة عمل نحو الف_وق"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
 msgid "/Transfer/Move File _Down"
 msgstr "نقل ل_مساحة عمل نحو التحت"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 #, fuzzy
 msgid "/Transfer/_Retrieve Files"
 msgstr "خواتم وقتية للملفات الجديدة"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 #, fuzzy
 msgid "/Transfer/_Put Files"
 msgstr "خواتم وقتية للملفات الجديدة"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 #, fuzzy
 msgid "/L_og"
 msgstr "/الدخول "
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 #, fuzzy
 msgid "/Log/tearoff"
 msgstr "/نوافذ/قاطف"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 #, fuzzy
 msgid "/Log/_Clear"
 msgstr "م_سح التاريخ"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
 msgid "/Log/_View"
 msgstr "وضعية _ العرض"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
 msgid "/Log/_Save..."
 msgstr "لا تحفظ"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/الأدوات "
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tools/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 #, fuzzy
 msgid "/Tools/C_ompare Windows"
 msgstr "السماح بالنوافذ ال_منبثقة"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 #, fuzzy
 msgid "/Tools/_Clear Cache"
 msgstr "حجم مخبأ القرص"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/مساعدة"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 #, fuzzy
 msgid "/Help/_About"
 msgstr "_حول الملحق"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "المضيف:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_مضيف"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "المنفد:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "المستخدم:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_مستخدم"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "كلمة العبور:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "أمر:"
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "اسم الملف "
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "الحجم "
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "التاريخ "
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "المدخلات "
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "التقدم "
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "خطأ :يجب ان تحدد اسم المضيف للاءتصال به\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "انعاش "
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 #, fuzzy
 msgid "Enter Username"
 msgstr "الرجاء إدخال إسم المستخدم:"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 #, fuzzy
 msgid "Please enter your username for this site"
 msgstr "الرجاء كلمة عبورك لهذا الموقع "
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "الرجاء كلمة عبورك لهذا الموقع "
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 #, fuzzy
 msgid "Operation canceled...you must enter a string\n"
 msgstr "موقع : العملية الغية ...يجب ادخال سلسلة حرفية \n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "كون مجلد "
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "ادخل اسم لمجلد لتكوينه"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "اعادة تسمية "
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "هل تريد اعادة تسميتها %sالى ؟"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "موقع "
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr " ادخال اوامر موقع محددة "
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 #, fuzzy
 msgid "Prepend with SITE"
 msgstr "تم الاتصال مع %s باستخدام %s"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "اعادة الكتابة "
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "معاودة "
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "الغاء "
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "الفعل "
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "نقل الملفات "
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2656,60 +2613,60 @@ msgstr ""
 "هذه الملفات موجودة بالفعل بالملقم و الجهاز المحلى \n"
 "الرجاء تحديد ماذا تريد ان تفعل "
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "الغاء ملف "
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "اختيار الكل "
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "عدم اختيار الكل"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 #, fuzzy
 msgid "Change Filespec"
 msgstr "تغيير كلمة السر"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "خطأ :لا يمكن فتح %s للكتابة %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "حفظ لائحة المجلدات "
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "خطأ :فى الكتابة الى %s%s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "تم بنجاح كتابة ملف الدخول الى %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "حفظ الدخول "
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2718,11 +2675,11 @@ msgstr ""
 "تعذر فى ايجاد نسخة ملف اتفاقية الحقوق الرجاء الرجاء التاءكد باءنها ب%s او فى "
 "%s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "حول جي‌إف‌تي‌بي‌"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -2734,99 +2691,79 @@ msgstr ""
 "الموقع الرسمى :http://www.جي‌إف‌تي‌بي‌.org/\n";
 "الشعار بواسطة ايرون ورلى<planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "حول "
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "اتفاقية الحقوق "
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "غلق "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "قارن النوافذ "
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 #, fuzzy
 msgid "Disconnect from the remote server"
 msgstr "الإتصال بخادم عن بعد"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "كل الملفات "
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "غير متصل  "
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "خطأ فى فتح الملف %s%s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s لا يوجد بالموقع البعيد \n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%sهذه الخاصية غير متاحة عند استخدام هذا البرتكول \n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s يجب ان يكون لديك عنصرواحد فقط لاختياره\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s يجب ان يكون لديك على الاقل عنصر واحد لاختياره\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "تغيير"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "اضافة"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "الغاء"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "نعم "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "لا "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "تحصيل لائحة المجلدات "
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "توقف "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2835,112 +2772,92 @@ msgstr ""
 "استقبال %ld مجلدات \n"
 "و%ldملفات "
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "خطأ جي‌إف‌تي‌بي‌:لايمكن ايجاد الملف %sفى %sاو%s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "تحرير مضيف"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "اضافة مضيف"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "نوع:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_نوع"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "المالك "
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "عنوان الشبكة"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 #, fuzzy
 msgid "_Network address:"
 msgstr "عنوان ال_شّبكة:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "قناع الشبكة"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 #, fuzzy
 msgid "N_etmask:"
 msgstr "قناع الشبكة"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 #, fuzzy
 msgid "_Domain:"
 msgstr "ال_نطاق:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "قناع الشبكة"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "المضيف المحلى "
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "تحرير"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_تعديل"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "خيارات"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "تطبيق"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "استقبال اسماء الملفات "
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "اتصال ...."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "البحث عن الملفات الغير متصلة بالموقع البعيد \n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr " خطأ الملحقات %dارجعت %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "الملحقات %d ارجعت بنجاح \n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, fuzzy, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr " خطأ الملحقات %dارجعت %d\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "خطأ لا يمكن الحصول على معلزمات عن الملف %s%s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "الملف%sلم يتغير \n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2949,111 +2866,159 @@ msgstr ""
 "ملف %sقد تغير \n"
 "هل تريد تحميله؟"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "تحرير ملف "
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "استكمل "
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, fuzzy, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "انعاش %sل%s عند %.2fكب/ث,%2d:%2d:%2dالوقت المتوقع "
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "انعاش %sل%s عند %.2fكب/ث,%2d:%2d:%2dالوقت المتوقع "
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, fuzzy, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "انعاش%sل%s التحويل معلق الوقت المتبقى مجهول "
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "انعاش%sل%s التحويل معلق الوقت المتبقى مجهول "
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "نسبة مكتملة مجهولة(File %ld of %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, fuzzy, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% استكمل ,%02d:%02d:%02dالوقت المتوقع الباقى "
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr " البحث عن اسماء الملفات %sبايتات"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "عرض"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "تحرير"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "عرض:لايمكن التحول لعمليات اخرى%s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "تنفيد البرنامج %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "عرض الملف %s بواسطة %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "اظهار الملفات %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "عرض:لا يمكن فتح الملف%s%s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, fuzzy, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "تعذر فتح الملف \"%s\". \n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "اسم مستخدم ـ[مجهول]ـ"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
+
+#~ 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.جي‌إف‌تي‌بي‌.org   \n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "..الغاء.."
+
+#~ msgid "Host: "
+#~ msgstr "المضيف:"
+
+#~ msgid "User: "
+#~ msgstr "المستخدم:"
+
+#~ msgid "  Close  "
+#~ msgstr "غلق "
+
+#~ msgid "Add"
+#~ msgstr "اضافة"
+
+#~ msgid "Cancel"
+#~ msgstr "الغاء"
+
+#~ msgid "  Yes  "
+#~ msgstr "نعم "
+
+#~ msgid "  No  "
+#~ msgstr "لا "
+
+#~ msgid "Type:"
+#~ msgstr "نوع:"
+
+#~ msgid "Network Address"
+#~ msgstr "عنوان الشبكة"
+
+#~ msgid "_Edit"
+#~ msgstr "_تعديل"
+
+#~ msgid "Apply"
+#~ msgstr "تطبيق"
diff --git a/po/as.po b/po/as.po
index 7e02c6a..3c39425 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,172 +6,169 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=gftp&component=general\n"
-"POT-Creation-Date: 2009-07-13 07:02+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-07-16 15:28+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan fedoraproject org>\n"
 "Language-Team: Assamese <fedora-trans-as redhat com>\n"
+"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "অকাৰ্য়কৰী URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ভুল: কেশ্ব অনুক্ৰমনিকা নথিপত্ৰ অবৈধ %s শাৰী\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "'%s' স্ট্ৰিঙক আখৰৰ গোট %s ৰ পৰা আখৰৰ গোট %s লৈ সলনি কৰোঁতে ভুল: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ভুল: %s স্থানীয নথিপত্ৰ খুলিব নোৱাৰে: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ভুল: ছকেটত ৰাইট কৰিব নোৱাৰিলে: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ভুল: ছকেটত ৰিড কৰিব নোৱাৰিলে: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "সঁকিযনি: মাষ্টাৰ পৃষ্ঠাসংকেত নথিপত্ৰ বিচাৰি উলিযাব নোৱাৰিলে %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP সঁকিযনি: পৃষ্ঠাসংকেত নথিপত্ৰত %d শাৰী বাদ দিছে: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP সঁকিযনি: %d শাৰীটোত য়ঠেষ্ট য়ুক্তি নাই\n"
 
-#: ../lib/config_file.c:504
+#: 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 or dont_use_proxy=network number/netmask"
+"এই অংশটোৱে কোনবোৰ আযোজক স্থানীয ছাবনেটত আছে আৰু কোনবোৰ প্ৰক্সি ছাৰ্ভাৰৰ (যদি আছে) "
+"বাহিৰলৈ য়োৱাৰ প্ৰযোজন নাই নিৰ্ধাৰণ কৰে । ছিন্টেক্স: dont_use_proxy= ।domain or "
+"dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "আপুনি ইনষ্টল কৰিছেনে?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP ভুল: ত্ৰুটিপূৰ্ণ লগ নথিপত্ৰৰ নাম %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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 ব্ৰাযেন "
-"মেছনি <"
-"masneyb gftp ।org> । সঁকিযনি: এই নথিপত্ৰত য়োগ কৰা য়িকোনো মন্তব্য অভাৰৰাইট "
-"কৰা হব"
+"gFTP ৰ বাবে পৃষ্ঠাসংকেত নথিপত্ৰ । প্ৰতিলিপি স্বত্ব (C) 1998-2007 ব্ৰাযেন মেছনি "
+"<masneyb gftp ।org> । সঁকিযনি: এই নথিপত্ৰত য়োগ কৰা য়িকোনো মন্তব্য অভাৰৰাইট কৰা হব"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -179,108 +176,104 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:845
+#: 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 ব্ৰাযেন "
-"মেছনি <"
-"masneyb gftp ।org> । সঁকিযনি: এই নথিপত্ৰত য়োগ কৰা য়িকোনো মন্তব্য অভাৰৰাইট "
-"কৰা হব । "
-"যদি কোনো প্ৰৱিষ্টিৰ মন্তব্যত (*) আছে, আপুনি সেইটো gFTP ৰ ভিতৰত সলনি কৰিব "
+"gFTP ৰ বাবে পৃষ্ঠাসংকেত নথিপত্ৰ । প্ৰতিলিপি স্বত্ব (C) 1998-2007 ব্ৰাযেন মেছনি "
+"<masneyb gftp ।org> । সঁকিযনি: এই নথিপত্ৰত য়োগ কৰা য়িকোনো মন্তব্য অভাৰৰাইট কৰা "
+"হব । যদি কোনো প্ৰৱিষ্টিৰ মন্তব্যত (*) আছে, আপুনি সেইটো gFTP ৰ ভিতৰত সলনি কৰিব "
 "নোৱাৰে ।"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
-"FATAL gFTP ভুল: ৰূপৰেখাৰ বিকল্প '%s' গ্লোবেল হেশ্ব টেবুলত বিচাৰি পোৱা নগল \n"
+msgstr "FATAL gFTP ভুল: ৰূপৰেখাৰ বিকল্প '%s' গ্লোবেল হেশ্ব টেবুলত বিচাৰি পোৱা নগল \n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ত্রুটি: ফাইল %s আপ-ল'ড কৰিব নোৱাৰি\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ত্রুটি: ফাইল %s লৈ লিখিব নোৱাৰি: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ত্রুটি: নথিপত্ৰ বন্ধ কৰোঁতে ভুল: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP সেৱক %s ৰ পৰা দূষিত নথিপত্ৰৰ তালিকা\n"
 
-#: ../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
+#: 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 "অজ্ঞাত "
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP পঞ্জিকাৰ তালিকা %s পোৱা ন'গ'ল: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "সফলভাবে %s লৈ পঞ্জিকা সলনি কৰা হ'ল\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "পঞ্জিকা %s লৈ সল;নি কৰিব নোৱাৰি\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s সফলভাৱে আঁতৰ কৰিছে\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ভুল: %s নথিপত্ৰ আঁতৰ কৰিব পৰা নগ'ল: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -288,142 +281,139 @@ msgstr ""
 "FTPS সমৰ্থন পোৱা নাযায় কাৰণ SSL সমৰ্থন সঙ্কলণ কৰা হোৱা নাই । সংযোগ বাতিল কৰা "
 "হৈছে ।\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "SSL সমৰ্থন সংকলন কৰা নাই বাবে HTTPS সমৰ্থন নাই । সংয়োগ এবৰ্ট কৰিছে ।\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "চলিত কৰ্ম নিৰ্দেশিকা পাব নোৱাৰিলে: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "স্থানীয নিৰ্দেশিকা %s লৈ সফলভাৱে সলনি কৰিলে\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "স্থানীয নিৰ্দেশিকা %s লৈ সলনি কৰিব নোৱাৰিলে: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ভুল: স্থানীয নথিপত্ৰ %s চুটি কৰিব নোৱাৰি: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "স্থানীয নিৰ্দেশিকাৰ তালিকা %s পাব নোৱাৰিলে: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ৰ মোডক সফলভাবে %o লৈ সলনি কৰা হ'ল\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ভুল: %s ৰ মোডক সফলভাবে %o লৈ সলনি কৰা ন'হ'ল: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s ৰ সময় সফলভাবে সলনি কৰা হ'ল\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ভুল: %s ৰ সময় সফলভাবে সলনি কৰা ন'হ'ল: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "স্থানীয নথিপত্ৰ ছিষ্টেম"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ব্যৱহাৰপদ্ধতি"
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "এটাও নহয "
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "নথিপত্ৰ "
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "আকাৰ "
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ব্যৱহাৰকৰ্তা"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "গোট"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "তাৰিখ সময"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "এট্ৰিবিউটবোৰ"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "নিম্নক্ৰম"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "উর্ধক্ৰম"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "সাধাৰণ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "প্রগ্রেম চাওক:"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "প্রগ্রাম সম্পাদনা কৰক:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "নথিপত্ৰবোৰ সম্পাদনা কৰিবলৈ ডিফল্ট প্ৰগ্ৰামটো ব্যৱহাৰ কৰা হয ।"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "সৰ্বাধিক লগ উইণ্ডৰ আকাৰ:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ পৰ্টটোৰ বাবে বাইটত লগ উইণ্ডখনৰ সৰ্বাধিক আকাৰ"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "দূৰৰ আখৰৰ সমষ্টি:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -431,11 +421,11 @@ msgstr ""
 "এইটো হৈছে কমাৰে পৃথক কৰা কাৰ্ছেটৰ তালিকা যিটো আঁতৰৰ খবৰ বৰ্তমানৰ স্থানীযটোলৈ "
 "ৰূপান্তৰ কৰাত ব্যৱহাৰ হব । "
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Remote LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -443,351 +433,349 @@ msgstr ""
 "দূৰৰ ছাইটৰ কাৰণে এইটো         ৰ মান । ইয়াৰ কাৰণ এইটোৱে যে পঞ্জিকাৰ তালিকাত "
 "দিনসমূহক শুদ্ধকৈ বিশ্লেষন কৰা যাব ।"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "কেশ্ব TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "সময উকলি য়োৱাৰ আগতে কেচ্চ প্ৰৱিষ্টিবোৰ ৰাখিবলগীযা ছেকেণ্ড । "
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "নথিপত্ৰ বদলিবোৰ সংলগ্ন কৰক"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "থকা নথিপত্ৰবোৰৰ সৈতে নতুন নথিপত্ৰ বদলি সংয়োগ কৰক"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "এবাৰত এটা বদলি কৰক"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "এবাৰত মাত্র এটা বদলি কৰিব নেকি?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "ডিফল্ট অনুসৰি অভাৰৰাইট কৰক"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr ""
-"ডিফল্ট অনুসৰি নথিপত্ৰবোৰ অভাৰৰাইট কৰক বা নথিপত্ৰ বদলি পুনৰ আৰম্ভ কৰক ছেট কৰক"
+msgstr "ডিফল্ট অনুসৰি নথিপত্ৰবোৰ অভাৰৰাইট কৰক বা নথিপত্ৰ বদলি পুনৰ আৰম্ভ কৰক ছেট কৰক"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "নথিপত্ৰৰ অনুমতিবোৰ সংৰক্ষিত কৰক"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "বদলি কৰা নথিপত্ৰবোৰৰ নথিপত্ৰৰ অনুমতি সংৰক্ষণ কৰক"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "নথিপত্ৰৰ সময় সংৰক্ষণ কৰক"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "স্থানান্তৰ কৰা নথিপত্ৰৰ সময় সংৰক্ষিত কৰক"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "প্ৰতিটো নথিপত্ৰ বদলি কৰাৰ পাছত পুনৰ সজীৱ কৰক"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "প্ৰতিটো নথিপত্ৰ বদলি কৰাৰ পাছত তালিকা বাকচটো পুনৰ সজীৱ কৰক"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "প্ৰথমে নিৰ্দেশিকাবোৰ বৰ্গীকৰণ কৰক"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "প্ৰথমে নিৰ্দেশিকা আৰু তাৰপাছত নথিপত্ৰবোৰ ৰাখক"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "লুকাই থকা নথিপত্ৰবোৰ দেখুৱাওক"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "লুকাই থকা নথিপত্ৰবোৰ তালিকা বাকচত দেখুৱাওক"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "শিৰোনামত স্থানান্তৰৰ অৱস্থা দেখুৱাওক"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "শিৰোনামবাৰত স্থানান্তৰৰ অৱস্থা দেখুৱাওক"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "নথিত্ৰৰ স্থানান্তৰ আৰম্ভ কৰক"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "কিউ কৰা হ'লে নিজেই নিজেই নথিপত্ৰৰ স্থানান্তৰ আৰম্ভ কৰক"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI ত হস্তচালিত আদেশৰ অনুমতি দিয়ক"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI ত হস্তচালিত আদেশৰ অনুমতি দিয়ক (text port ৰ নিচিনা আপেক্ষক)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "শেহতীয়া পঞ্জিকা মনত ৰাখিব"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "অনুপ্ৰয়োগ বন্ধ হ'লে শেষৰ স্থানীয় আৰু দূৰৰ পঞ্জিকা ৰক্ষা কৰা হ'ব"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "আৰম্ভ হওঁতে দূৰৰ সেৱকলৈ সংযোগ কৰক"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "অনুপ্ৰয়োগ আৰম্ভ হওঁতে নিজেই নিজেই দূৰৰ সেৱকলৈ সংযোগ কৰক ।"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "নেটৱৰ্ক"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "নেটৱৰ্কৰ সময পাৰ হৈছে:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "টাইমআউটটোৱে নেটৱৰ্ক ইনপুট/আউটপুটৰ অপেক্ষা কৰিছে । এইটো অকামিলা টাইমআউট নহয । "
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "পুনৰ চেষ্টাবোৰ সংয়োগ কৰক:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
-"স্বয়ংক্ৰিয়ভাবে কৰা পুনঃ চেষ্টাৰ সংখ্যা । অনিশ্চিতকাললৈ পুনঃ চেষ্টা কৰিবলৈ "
-"ইয়াক ০ লৈ নিৰ্ধাৰিত কৰক"
+"স্বয়ংক্ৰিয়ভাবে কৰা পুনঃ চেষ্টাৰ সংখ্যা । অনিশ্চিতকাললৈ পুনঃ চেষ্টা কৰিবলৈ ইয়াক ০ লৈ "
+"নিৰ্ধাৰিত কৰক"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "শোৱাৰ সময পুনৰ চেষ্টা কৰক:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "পুনৰ চেষ্টাৰ মাজত অপেক্ষা কৰিবলগীযা ছেকেণ্ড"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "সৰ্বাধিক KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "নথিপত্ৰ বদলি এটাই পাব পৰা সৰ্বাধিক KB/s । (অক্ষম কৰিবলৈ 0 ত ছেট কৰক)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "স্থানান্তৰৰ ব্ল'কৰ আকাৰ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
-"নথিপত্ৰ স্থানান্তৰ কৰোঁতে ব্যৱহাৰ কৰা বল'কৰ আকাৰ । এইটো ১০২৪ ৰ গুণক হ'ব "
-"লাগিব ।"
+"নথিপত্ৰ স্থানান্তৰ কৰোঁতে ব্যৱহাৰ কৰা বল'কৰ আকাৰ । এইটো ১০২৪ ৰ গুণক হ'ব লাগিব ।"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ডিফল্ট প্রটকল:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "এইটোৱে ব্যৱহাৰ কৰিবলগীযা ডিফল্ট প্ৰটকল নিৰ্ধাৰণ কৰে"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "     সমৰ্থন সক্ৰিয় কৰক"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=নথিপত্ৰ বদলি কৰক"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "স্থানীয নথিপত্ৰৰ তালিকা বাকচটোৰ ডিফল্ট প্ৰস্থ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "আঁতৰৰ নথিপত্ৰৰ তালিকা বাকচটোৰ ডিফল্ট প্ৰস্থ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "স্থানীয/আঁতৰৰ নথিপত্ৰ তালিকা বাকচবোৰৰ ডিফল্ট উচ্চতা"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "বদলি তালিকা বাকচটোৰ ডিফল্ট উচ্চতা"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "লগিং উইণ্ডখনৰ ডিফল্ট উচ্চতা ।"
 
-#: ../lib/options.h:177
+#: 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 ত ছেট কৰক ।  "
+"নথিপত্ৰ তালিকা বাকচবোৰত নথিপত্ৰৰ নাম স্তম্ভৰ প্ৰস্থ । স্তম্ভবোৰক স্বযংক্ৰিযভাৱে আকাৰ "
+"দিবলৈ ইযাক 0 ত ছেট কৰক ।  "
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ডিফল্ট স্তম্ভটো বৰ্গীকৰণ কৰিব কৰিব লাগিব"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "উৰ্ধক্ৰম বা নিম্নক্ৰমত বৰ্গীকৰণ কৰক"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "ছাৰ্ভাৰলৈ পথোৱা নিৰ্দেশবোৰৰ ৰং"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "ছাৰ্ভাৰৰ পৰা পোৱা নিৰ্দেশবোৰৰ ৰং"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ভুলৰ খবৰৰ ৰং"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "বাকী লগ খবৰবোৰৰ ৰং"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP "
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "স্থানীয"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "পৃষ্ঠাসংকেত "
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "নথিপত্ৰ বদলিৰ হাৰ % .2f KB/s লৈ হ্ৰাস কৰা হব\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME ক '%s' লৈ নিৰ্ধাৰণ কৰোঁতে ব্যৰ্থ । '%s' লৈ ঘূৰি যোৱা হৈছে\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "কেশ্বেৰ পৰা %s পঞ্জিকাৰ তালিকা তুলি লোৱা হৈছে (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "সেৱকৰ পৰা %s পঞ্জিকাৰ তালিকা তুলি লোৱা হৈছে (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -796,110 +784,110 @@ msgstr ""
 "সকিয়নি : '%s' নথিপত্ৰৰ পৰা পথ গোচোৱা হৈছে । গোচোৱা পথ (%s) বৰ্ত্তমানৰ পঞ্জিকা "
 "(%s)ৰ সৈতে অমিল\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ভুল: কেচ্চত ৰাইট কৰিব নোৱাৰে: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ভুল: পৃষ্ঠাসংকেত বিচাৰি উলিযাব নোৱাৰিলে %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "পৃষ্ঠাসংকেতত ভুল: পৃষ্ঠাসংকেত প্ৰৱিষ্টি %s টোৰ আযোজকৰ নাম নাই\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "'%s' প্ৰটকলটো বৰ্তমান সমৰ্থিত নহয ।\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "ৰিকাৰ্ছিভ চিম্বোলিক %s লিঙ্ক পোৱা গৈছে\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
-"ভুল: আঁতৰৰ ছাইট %s সংয়োগ বিচ্ছিন্ন কৰা হৈছে । পুনৰ চেষ্টাৰ সৰ্বাধিক সংখ্য়া "
-"পাইছে ...বাদ দিছে\n"
+"ভুল: আঁতৰৰ ছাইট %s সংয়োগ বিচ্ছিন্ন কৰা হৈছে । পুনৰ চেষ্টাৰ সৰ্বাধিক সংখ্য়া পাইছে ..."
+"বাদ দিছে\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "মাষ্টাৰ pty %s খুলিব নোৱাৰে: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ছকেটল এয়োৰ তৈযাৰ কৰিবলৈ অক্ষম:%s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ভুল: ssh কাৰ্য়কৰী কৰিব নোৱাৰি: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "আন প্ৰক্ৰিযা এটা বিভক্ত কৰিব নোৱাৰে: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "প্ৰক্সি আযোজকৰ নাম:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ফায়াৰৱাল আযোজকৰ নাম"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "প্রক্সি পর্ট:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ফায়াৰৱালত সংয়োগ কৰিবলৈ পৰ্ট"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "প্ৰক্সি ব্যৱহাৰকৰ্তাৰ নাম: "
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "আপোনাৰ ফায়াৰৱাল ব্যৱহাৰকৰ্তাৰ নাম"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "প্ৰক্সি পাছৱর্ড নাম: "
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "আপোনাৰ ফায়াৰৱাল পাছৱৰ্ড"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1 ।1 ব্যৱহাৰ কৰক"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -908,83 +896,83 @@ msgstr ""
 "ছাৰ্ভাৰৰ পৰা ভুল সঁহাৰি পাইছে, সংয়োগ বিচ্ছিন্ন কৰিছে\n"
 "অকাৰ্য়কৰী চাংকৰ আকাৰ '%s' আঁতৰৰ ছাৰ্ভাৰে ঘূৰাই পথাইছে\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "অফছেটত নথিপত্ৰৰ স্থানান্তৰ আৰম্ভ কৰা হৈছে"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s নথিপত্ৰ উদ্ধাৰ কৰিব নোৱাৰি:\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "নিৰ্দেশিকাৰ তালিকা উদ্ধাৰ কৰিছে ...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ছাৰ্ভাৰৰ পৰা ভুল সঁহাৰি পাইছে, সংয়োগ বিচ্ছিন্ন কৰিছে ।\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE নির্দেশ"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "ব্যৱহাৰকৰ্তা আযোজক"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "ব্যৱহাৰকৰ্তা আযোজক:পৰ্ট"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "ব্যৱহাৰকৰ্তা আযোজক পর্ট "
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "ব্যৱহাৰকৰ্তা আযোজক NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP প্রক্সি"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "কাষ্টম"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ই-মেইল ঠিকনা:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "আঁতৰৰ FTP ছাৰ্ভাৰত বেনামী হিচাপে লগইন কৰোঁতে এই পাছৱৰ্ডটো ব্যৱহাৰ হব"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "প্ৰক্সি একাউন্ট:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "আপোনাৰ ফায়াৰৱাল একাউন্ট (বৈকল্পিক)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "প্রক্সি ছার্ভাৰৰ প্ৰকাৰ:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -994,32 +982,30 @@ msgid ""
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
 msgstr ""
-"আপুনি উইণ্ডজৰ পৰা টেক্সট নথিপত্ৰ ইউনিক্সলৈ বদলি কৰিছে, তেন্তে আপুনি এইটো "
-"সক্ষম "
-"কৰিব লাগিব । টেক্সট নথিপত্ৰৰ বাবে প্ৰতিটো কম্পিউটাৰে নিউজলাইন বেলেগ বেলেগকৈ "
-"প্ৰকাশ কৰে । আপুনি যদি ইউনিক্সৰ পৰা ইউনিক্সলৈ বদলি কৰিছে এইটো এৰি য়োৱাটো "
-"নিৰাপদ । আপুনি যদি বাইনেৰী ডাটা ডাউনলোড কৰিছে, আপুনি এইটো অক্ষম কৰিবলৈ "
-"বিচাৰিব ।"
+"আপুনি উইণ্ডজৰ পৰা টেক্সট নথিপত্ৰ ইউনিক্সলৈ বদলি কৰিছে, তেন্তে আপুনি এইটো সক্ষম কৰিব "
+"লাগিব । টেক্সট নথিপত্ৰৰ বাবে প্ৰতিটো কম্পিউটাৰে নিউজলাইন বেলেগ বেলেগকৈ প্ৰকাশ কৰে "
+"। আপুনি যদি ইউনিক্সৰ পৰা ইউনিক্সলৈ বদলি কৰিছে এইটো এৰি য়োৱাটো নিৰাপদ । আপুনি যদি "
+"বাইনেৰী ডাটা ডাউনলোড কৰিছে, আপুনি এইটো অক্ষম কৰিবলৈ বিচাৰিব ।"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ঠিকনা আওকাণ কৰক"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"এইটো সক্ৰিয় হ 'লে, দূৰৰ     সেৱকৰ         ঠিকনাৰ ক্ষেত্ৰ আওকাণ কৰা হ'ব আৰু "
-"তাৰ সলনি গৃহস্থৰ    ঠিকনা ব্যৱহাৰ কৰা হ'ব । "
+"এইটো সক্ৰিয় হ 'লে, দূৰৰ     সেৱকৰ         ঠিকনাৰ ক্ষেত্ৰ আওকাণ কৰা হ'ব আৰু তাৰ "
+"সলনি গৃহস্থৰ    ঠিকনা ব্যৱহাৰ কৰা হ'ব । "
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "নিস্ক্ৰিয নথিপত্ৰ বদলি"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1028,415 +1014,403 @@ 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
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "ৰিমট ছিমলিংক সমাধান কৰক (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
 msgstr ""
-"gFTP ৰ বাবে পৃষ্ঠাসংকেত নথিপত্ৰ । প্ৰতিলিপি স্বত্ব সঁকিযনি: এই নথিপত্ৰত য়োগ "
-"কৰা "
-"য়িকোনো মন্তব্য অভাৰৰাইট কৰা হব । যদি কোনো প্ৰৱিষ্টিৰ মন্তব্যত (*) আছে, আপুনি "
-"সেইটো gFTP ৰ ভিতৰত সলনি কৰিব নোৱাৰে ।"
+"gFTP ৰ বাবে পৃষ্ঠাসংকেত নথিপত্ৰ । প্ৰতিলিপি স্বত্ব সঁকিযনি: এই নথিপত্ৰত য়োগ কৰা "
+"য়িকোনো মন্তব্য অভাৰৰাইট কৰা হব । যদি কোনো প্ৰৱিষ্টিৰ মন্তব্যত (*) আছে, আপুনি সেইটো "
+"gFTP ৰ ভিতৰত সলনি কৰিব নোৱাৰে ।"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII মোডত নথিপত্ৰবোৰ বদলি কৰক"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
-"আপুনি উইণ্ডজৰ পৰা টেক্সট নথিপত্ৰ ইউনিক্সলৈ বদলি কৰিছে, তেন্তে আপুনি এইটো "
-"সক্ষম "
-"কৰিব লাগিব । টেক্সট নথিপত্ৰৰ বাবে প্ৰতিটো কম্পিউটাৰে নিউজলাইন বেলেগ বেলেগকৈ "
-"প্ৰকাশ কৰে । আপুনি যদি ইউনিক্সৰ পৰা ইউনিক্সলৈ বদলি কৰিছে এইটো এৰি য়োৱাটো "
-"নিৰাপদ । আপুনি যদি বাইনেৰী ডাটা ডাউনলোড কৰিছে, আপুনি এইটো অক্ষম কৰিবলৈ "
-"বিচাৰিব ।"
+"আপুনি উইণ্ডজৰ পৰা টেক্সট নথিপত্ৰ ইউনিক্সলৈ বদলি কৰিছে, তেন্তে আপুনি এইটো সক্ষম কৰিব "
+"লাগিব । টেক্সট নথিপত্ৰৰ বাবে প্ৰতিটো কম্পিউটাৰে নিউজলাইন বেলেগ বেলেগকৈ প্ৰকাশ কৰে "
+"। আপুনি যদি ইউনিক্সৰ পৰা ইউনিক্সলৈ বদলি কৰিছে এইটো এৰি য়োৱাটো নিৰাপদ । আপুনি যদি "
+"বাইনেৰী ডাটা ডাউনলোড কৰিছে, আপুনি এইটো অক্ষম কৰিবলৈ বিচাৰিব ।"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "PASV সঁহাৰিত IP ঠিকনা বিচাৰি উলিযাব নোৱাৰিলে '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ডাটা সংয়োগ এটা তৈযাৰ কৰিব নোৱাৰে:%s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "পৰ্ট বাইণ্ড কৰিব নোৱাৰে: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "এটা IPv6 ছকেট নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
-msgstr ""
-"ভুল: আমি IPv6 ৰ জৰিযতে সংয়োকৃত হোৱা বুলি অনুমান নহয । সংয়োগ এবৰ্ট কৰিছে ।\n"
+msgstr "ভুল: আমি IPv6 ৰ জৰিযতে সংয়োকৃত হোৱা বুলি অনুমান নহয । সংয়োগ এবৰ্ট কৰিছে ।\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "অকাৰ্য়কৰী EPSV সঁহাৰি '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "স্থানীয ছকেটৰ ঠিকনা পাব নোৱাৰি: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ছাৰ্ভাৰৰ পৰা সংয়োগ স্বীকাৰ কৰিব নোৱাৰি: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "সৰ্বমুঠ "
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "ছকেট ফ্লেগ পাব নোৱাৰে:%s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "ছকেট নন-ব্লকিঙত ছেট কৰিব নোৱাৰে: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH প্ৰগ্ৰামৰ নাম:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH লৈ পথ কাৰ্য়কৰী কৰিব পৰা"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH অতিৰিক্ত পৰম :"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH প্ৰগ্ৰামটোলৈ পথাবলগীযা অতিৰিক্ত পেৰামিটাৰ"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ব্যৱহাৰকৰ্তা/পাছৰ প্ৰযোজন"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH সংয়োগৰ বাবে ব্যৱহাৰকৰ্তাৰ নাম/পাছৱৰ্ডৰ প্ৰযোজন"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "%s প্ৰগ্ৰাম চলাইছে\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA চাবিৰ কাৰণে গুপ্তশব্দ দিয়ক"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "' চাবিৰ কাৰণে গুপ্তশব্দ দিয়ক"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "পাছৱৰ্ড"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "পাছৱৰ্ড:"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr " হয় নহয়"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE দিয়ক:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "পাছৱর্ড ভৰাওক"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID গুপ্তশব্দ দিয়ক:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ভুল: ভুল পাছৱৰ্ড এটা ভৰোৱা হৈছে\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d:প্ৰটকল ইনিশ্ব্যীযেলাইজেশ্বন\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: প্ৰটকলৰ সংস্কৰণ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: খোলক %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: বন্ধ কৰক\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: %sনির্দেশিকা খোলক\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: নির্দেশিকা ৰিড কৰক\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: %s নথিপত্ৰ আঁতৰ কৰক\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: %sনির্দেশিকা বনাওক\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: %sনিৰ্দেশিকা আঁতৰ কৰক\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: আচল পথ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: নথিপত্ৰৰ এট্রিবিযুটবোৰ\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: পৰিসংখ্য়া %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "তেনে কোনো নথিপত্ৰ বা নিৰ্দেশিকা নাই"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "অনুমতি অস্বীকৃত"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "বিফলতা"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ত্ৰুটিপূৰ্ণ খবৰ"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "কোনো সংয়োগ নাই"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "সংয়োগ হেৰাইছে"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "অপাৰেশ্বন সমৰ্থিত নহয"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "ছাৰ্ভাৰৰ পৰা অজ্ঞাত খবৰ ঘূৰি আহিছে"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ভুল: খবৰৰ আকাৰ %d বৰ ডাঙৰ\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s লৈ SSH সংয়োগ খুলিছে\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH ছাৰ্ভাৰত সফলভাৱে লগইন কৰা হৈছে %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL ইঞ্জিন"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL এনট্ৰপি নথিপত্ৰ:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL এনট্ৰপি নথিপত্ৰ:"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "এনট্ৰপি ছিডৰ দৈর্ঘ্য়:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL ইঞ্জিনর সৈতে ছীড কৰিবলগীযা সৰ্বাধিক বাইট"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1449,11 +1423,11 @@ msgstr ""
 "বিষয = %s\n"
 "ভুল %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "সমনীযাৰ প্ৰমানপত্র ল'ব নোৱাৰে\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1462,122 +1436,121 @@ msgstr ""
 "ভুল: SSL প্ৰমাণপত্রত থকা আযোজক(%s) আমি সংয়োগ কৰা আযোজক (%s) ৰ সৈতে নিমিলে । "
 "সংয়োগ এবৰ্ট কৰিছে ।\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "SSL প্ৰমাণপত্র লোড কৰোঁতে ভুল হৈছে\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "চাইফাৰ তালিকা ছেট কৰোঁতে ভুল হৈছে (বৈধ চাইফাৰ নহয)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ভুল: SSL ইঞ্জিন আৰম্ভ কৰা হোৱা নাছিল\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "ভুল ছেট আপ কৰিছে SSL সংয়োগ (BIO অবজেক্ট)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "ভুল ছেট আপ কৰিছে SSL সংয়োগ (SSL অবজেক্ট)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "সমনীযাৰ প্ৰমানপত্রত ভুল আছে: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "অপাৰেশ্বন বাতিল কৰা হৈছে\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "পুনৰ সংয়োগ কৰাৰ আগতে %d ছেকেণ্ড ৰৈ আছে\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 কোনো ৱাৰেন্টি নাথাকে, বিতং তথ্য়ৰ বাবে প্ৰতিলিপি নথিপত্ৰ চাওক । এইটো "
-"হৈছে "
-"বিনামূলীযা ছফটৱেৰ, আৰু কিছুমান নিৰ্দিষ্ট চৰ্তৰ অধীনত আপুনি পুনৰ বিতৰণ কৰিব "
-"পাৰিব; বিতং তথ্য়ৰ বাবে প্ৰতিলিপি নথিপত্ৰ চাওক\n"
+"gFTP কোনো ৱাৰেন্টি নাথাকে, বিতং তথ্য়ৰ বাবে প্ৰতিলিপি নথিপত্ৰ চাওক । এইটো হৈছে "
+"বিনামূলীযা ছফটৱেৰ, আৰু কিছুমান নিৰ্দিষ্ট চৰ্তৰ অধীনত আপুনি পুনৰ বিতৰণ কৰিব পাৰিব; "
+"বিতং তথ্য়ৰ বাবে প্ৰতিলিপি নথিপত্ৰ চাওক\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr " ...দ্বাৰা অনুবাদ কৰা হৈছে "
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: পুনৰ নামকৰণ কৰক <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: <file> ডিলিট কৰক\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "অকাৰ্য়কৰী য়ুক্তি\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "নিৰ্দেশিকা কেশ্ব আঁতৰ কৰক\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: [চলক = মান] ছেট কৰক\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ভুল: %s চলকটো বৈধ ৰূপৰেখাৰ চলক নহয ।\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1585,325 +1558,322 @@ msgstr ""
 "সমৰ্থিত নিৰ্দেশবোৰ:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ব্যৱহাৰ প্ৰণালী: %s\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "বিষযে "
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP তথ্য় দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "চলিত নথিপত্ৰটোৰ বদলিৰ মোড Ascii ত ছেট কৰক (কেৱল FTP ৰ বাবে)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "বাইনেৰী "
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "চলিত নথিপত্ৰটোৰ বদলিৰ মোড বাইনেৰীত ছেট কৰক (কেৱল FTP ৰ বাবে)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "আঁতৰৰ কৰ্ম নিৰ্দেশিকা সলনি কৰে"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "আঁতৰৰ নথিপত্ৰবোৰৰ অনুমতিবোৰ সলনি কৰে"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "আঁতৰ কৰক"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "থকা বিকল্পবোৰ হৈছে:কেশ্ব "
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "বন্ধ কৰক "
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "আঁতৰৰ ছাইটটোৰ পৰা সংয়োগ বিচ্ছিন্ন কৰক"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "ডিলিট কৰক "
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "দূৰৰ নথিপত্ৰ এটা পুনৰ নামকৰণ কৰে"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "বৰ্তমানৰ আঁতৰৰ নিৰ্দেশিকাৰ বাবে নিৰ্দেশিকা তালিকা দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "লওক"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "দূৰৰ নথিপত্ৰ(বোৰ) ডাউনলোড কৰে"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "সহায "
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "এই সহাযৰ স্ক্ৰীনখন দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "স্থানীয কৰ্ম নিৰ্দেশিকা সলনি কৰে"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "স্থানীয নথিপত্ৰবোৰৰ অনুমতিবোৰ সলনি কৰে"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "lডিলিট কৰক"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "স্থানীয নথিপত্ৰ এটা আঁতৰ কৰে"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "বৰ্তমানৰ স্থানীয নিৰ্দেশিকাৰ বাবে নিৰ্দেশিকা তালিকা দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "স্থানীয নিৰ্দেশিকা এখন তৈযাৰ কৰে"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "বৰ্তমানৰ স্থানীয নিৰ্দেশিকা দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "স্থানীয নথিপত্ৰ এটা পুনৰ নামকৰণ কৰক"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "স্থানীয নিৰ্দেশিকা এখন আঁতৰ কৰক"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "দূৰৰ নির্দেশিকা তৈযাৰ কৰে"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "স্থানীয নথিপত্ৰ(বোৰ) আপলোড কৰক"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "খোলক "
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "দূৰৰ ছাইট এটাৰ সৈতে সংয়োগ এটা কৰে"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "ৰাখক"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "বৰ্তমানৰ স্থানীয নিৰ্দেশিকা দেখুৱাওক"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "ত্য়াগ কৰক"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr " gFTP ৰ পৰা প্ৰস্থান কৰক"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "পুনৰ নাম দিযক "
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "দূৰৰ নথিপত্ৰ পুনৰ নামকৰণ কৰক"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "দূৰৰ নির্দেশিকা আঁতৰ কৰক"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "ছেট কৰক "
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
-"ৰূপৰেখা নথিপত্ৰ চলকবোৰ দেখুৱাওক ।  set var=val ৰ দ্বাৰাও আপুনি চলকবোৰ ছেট "
-"কৰিব "
+"ৰূপৰেখা নথিপত্ৰ চলকবোৰ দেখুৱাওক ।  set var=val ৰ দ্বাৰাও আপুনি চলকবোৰ ছেট কৰিব "
 "পাৰিব"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "স্থান"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ভুল: নিৰ্দেশ স্বীকাৰ কৰা নাই\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s আযোজকত %s নথিপত্ৰ বাদ দিছে\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s আযোজকত বদলি বন্ধ কৰিছে\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s পৰা %s ডাউনলোড কৰিব নোৱাৰিলে\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: বেলেগ কিবা কৰিবলৈ প্ৰথমে বন্ধ কৰক বাটনটো ক্লিক কৰক\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "পৃষ্ঠাসংকেত চলাওক"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "পৃষ্ঠাসংকেত য়োগ কৰক: পৃষ্ঠাসংকেতটোৰ বাবে আপুনি নাম এটা ভৰাব লাগিব\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
-"পৃষ্ঠাসংকেত য়োগ কৰক: পৃষ্ঠাসংকেত %s য়োগ কৰিব নোৱাৰি কাৰণ সেই নামটো ইতিমধ্য়ে "
-"আছে\n"
+"পৃষ্ঠাসংকেত য়োগ কৰক: পৃষ্ঠাসংকেত %s য়োগ কৰিব নোৱাৰি কাৰণ সেই নামটো ইতিমধ্য়ে আছে\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "পৃষ্ঠাসংকেত য়োগ কৰক "
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "পৃষ্ঠাসংকেত য়োগ কৰক: আপুনি আযোজকৰ নাম এটা ভৰাব লাগিব\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1913,137 +1883,130 @@ msgstr ""
 "ছাবমেনুত ৰখাৰ বাবে আইটেমবোৰ পৃথক কৰিবলৈ আপুনি / ব্যৱহাৰ কৰিব পাৰে\n"
 "(উদাহৰণ স্বৰূপে: লিনাক্স ছাইট/ডেবিযান)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "পাছৱৰ্ড মনত পেলাওক"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "নতুন ফল্ডাৰ "
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "তৈযাৰ কৰিবলগীযা নতুন ফল্ডাৰটোৰ নাম ভৰাওক"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "তৈযাৰ কৰিবলগীযা নতুন আইটেমটোৰ নাম ভৰাওক"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "পৃষ্ঠাসংকেত ডিলিট কৰক "
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "পৃষ্ঠাসংকেতবোৰ "
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "প্রৱিষ্টি সম্পাদনা কৰক"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "বিৱৰণ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "আযোজকৰ নাম:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "পৰ্ট: "
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "প্ৰটকল:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "নির্দেশিকা আঁতৰ কৰক:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "স্থানীয নিৰ্দেশিকা:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ব্যৱহাৰকৰ্তাৰ নাম:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "পাছৱৰ্ড:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "একাউন্ট:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "বেনামী হিচাপে লগইন কৰক"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "বাতিল কৰক"
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/নথিপত্ৰ"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/নথিপত্ৰ/টিযেৰঅফ"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/নথিপত্ৰ/sep ..."
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "পৃষ্ঠাসংকেতবোৰ সম্পাদনা কৰক"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2051,91 +2014,90 @@ msgstr ""
 "এতিযা আপুনি আপোনাৰ নথিপত্ৰৰ(বোৰ) এট্ৰিবিউটবোৰ নিযন্ত্রণ কৰিব পাৰিব\n"
 "টোকা: সকলোবোৰ ftp ছাৰ্ভাৰে chmod বৈশিষ্ট্য়টো সমৰ্থন নকৰে"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "বিশেষ "
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ষ্টিকি"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ব্যৱহাৰকৰ্তা "
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "ৰিড"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "ৰাইট"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "কার্য়কৰী কৰক "
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "গোট "
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "অন্য় "
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "%ld নথিপত্ৰ আৰু %ld নিৰ্দেশিকাবোৰ ডিলিট কৰিম বুলি আপুনি নিশ্চিতনে"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "নথিপত্ৰ/নিৰ্দেশিকাবোৰ ডিলিট কৰক"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "ডিলিট কৰক"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "সংয়ুক্ত কৰক"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "পোৱা URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "টানক আৰু ৰাখক"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "প্রস্থান কৰক "
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2143,468 +2105,455 @@ msgstr ""
 "নথিপত্ৰৰ বদলি চলি আছে ।\n"
 "প্ৰস্থান কৰিম বুলি আপুনি নিশ্চিতনে?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "স্থান খোলক"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/প্ৰস্থান কৰক"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/স্থানীয  "
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/স্থানীয/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/স্থানীয/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/স্থানীয/সকলোবোৰ নথিপত্ৰ নিৰ্বাচন কৰক"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/স্থানীয/সকলোবোৰৰ নিৰ্বাচন বাতিল কৰক"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/স্থানীয/নিৰ্দেশিকাৰ তালিকা ছেভ কৰক ..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/স্থানীয/SITE নিৰ্দেশ পথাওক ..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/আঁতৰৰ"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/আঁতৰৰ/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/আঁতৰৰ/sep ..."
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/আঁতৰৰ/সকলোবোৰ নথিপত্ৰ নিৰ্বাচন কৰক"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/আঁতৰৰ/সকলোবোৰৰ নিৰ্বাচন বাতিল কৰক"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/আঁতৰৰ/নিৰ্দেশিকাৰ তালিকা ছেভ কৰক ..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/আঁতৰৰ/SITE নিৰ্দেশ পথাওক ..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/পৃষ্ঠাসংকেতবোৰ"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/পৃষ্ঠাসংকেতবোৰ/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/পৃষ্ঠাসংকেতবোৰ/পৃষ্ঠাসংকেতবোৰ সম্পাদনা কৰক"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/পৃষ্ঠাসংকেতবোৰ/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/টুলবোৰ"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/সঁজুলিবোৰ/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "সহায "
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/সহায/টিযেৰঅফ"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/সহায/_বিষযে"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "আযোজক:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_আযোজক:"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "পৰ্ট:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ব্যৱহাৰকৰ্তা:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_ব্যৱহাৰকৰ্তা:"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "পাছ:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "নির্দেশ"
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "নথিপত্ৰৰ নাম "
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "আকাৰ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "তাৰিখ "
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "এট্ৰিবিউটবোৰ "
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "অগ্ৰগতি"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ভুল: সংয়োগ কৰিবলৈ আপুনি আযোজকত টাইপ কৰিব লাগিব\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "পুনৰ সজীৱ কৰক"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "এই ছাইটটোৰ বাবে পাছৱৰ্ড ভৰাওক"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "নির্দেশিকা তৈযাৰ কৰক"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "তৈযাৰ কৰিবলগীযা নিৰ্দেশিকাৰ নাম ভৰাওক"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "পুনৰ নাম দিযক "
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "আপুনি %s পুনৰ নামকৰণ কৰিবলৈ বিচাৰে নেকি?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "স্থান"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ছাইটৰ সৈতে নিৰ্ধাৰিত নিৰ্দেশ ভৰাওক"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "অভাৰৰাইট"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "পুনৰ আৰম্ভ কৰক"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "এৰি য়াওক"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "কাৰ্য়"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "নথিপত্ৰ বদলি কৰক"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2612,75 +2561,73 @@ msgstr ""
 "তলৰ নথিপত্ৰ(বোৰ) স্থানীয আৰু আঁতৰৰ কম্পিউটাৰত আছে\n"
 "আপুনি কি কৰিবলৈ বিচাৰে নিৰ্বাচন কৰক"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ভুল"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "নথিপত্ৰ বাদ দিযক"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "সকলোবোৰ নিৰ্বাচন কৰক"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "সকলোবোৰৰ নিৰ্বাচন বাতিল কৰক"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
-"Filespec সলনি কৰক: অপাৰেশ্বন বাতিল কৰা হৈছে ...আপুনি ষ্ট্ৰিং এটা ভৰাব "
-"লাগিব\n"
+"Filespec সলনি কৰক: অপাৰেশ্বন বাতিল কৰা হৈছে ...আপুনি ষ্ট্ৰিং এটা ভৰাব লাগিব\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec সলনি কৰক"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ভুল: ৰাইট কৰাৰ বাবে %s খুলিব নোৱাৰে: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "নিৰ্দেশিকাৰ তালিকা ছেভ কৰক"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ভুল: %s ত ৰাইট কৰোঁতে এটা ভুল হৈছে: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s ত সফলভাৱে লগ নথিপত্ৰ ৰাইট কৰা হৈছে\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "লগ ছেভ কৰক"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
-"অনুজ্ঞাপত্র চুক্তিৰ নথিপত্ৰ প্ৰতিলিপি কৰা পোৱা গৈছে । এইটো নিশ্চিত কৰক য়ে ই "
-"হযতো "
-"%s বা %s ত আছে"
+"অনুজ্ঞাপত্র চুক্তিৰ নথিপত্ৰ প্ৰতিলিপি কৰা পোৱা গৈছে । এইটো নিশ্চিত কৰক য়ে ই হযতো %s "
+"বা %s ত আছে"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP ৰ বিষযে"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2688,98 +2635,78 @@ msgid ""
 "Official Homepage: http://www.gftp.org/\n";
 msgstr ""
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "বিষয়ে"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "অনুজ্ঞাপত্রৰ চুক্তি"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "বন্ধ কৰক "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "উইণ্ডবোৰ তুলনা কৰক"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "সকলোবোৰ নথিপত্ৰ "
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (কেচ্চড) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "সংয়কৃত নহয"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s নথিপত্ৰ খোলোতে ভুল হৈছে: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s:আঁতৰৰ ছাইটৰ সৈতে সংয়োগকৃত নহয\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: প্ৰটকল ব্যৱহাৰ কৰি এই বৈশিষ্ট্য়টো উপলব্ধ নহয ।\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: আপুনি কেৱল এটা আইটেম নিৰ্বাচন কৰিব লাগিব\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: আপুনি অন্ততঃ এটা আইটেম নিৰ্বাচন কৰিব লাগিব\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "সলনি কৰক"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "য়োগ কৰক "
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "বাতিল"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "হয "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "নহয "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "নির্দেশিকাৰ তালিকা পাইছে"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "বন্ধ কৰক "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2788,109 +2715,89 @@ msgstr ""
 "%ld নিৰ্দেশিকা \n"
 "আৰু %ld নথিপত্ৰ পোৱা গৈছে"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP ভুল: %s বা %s ত মাষ্টাৰ %s নথিপত্ৰ বিচাৰি উলিযাব নোৱাৰে\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "আযোজক সম্পাদনা কৰক"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "আযোজক য়োগ কৰক"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "প্ৰকাৰ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "প্ৰকাৰ:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ডমেইন "
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "নেটৱৰ্কৰ ঠিকনা"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "নেটমাস্ক"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "নেটমাস্ক"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "স্থানীয আযোজকবোৰ"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "সম্পাদনা কৰক"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "সম্পাদনা কৰক "
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "বিকল্পবোৰ"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "প্ৰয়োগ কৰক"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "নথিপত্ৰৰ নামবোৰ পাইছে ..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "সংয়োগ কৰিছে ... "
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "নথিপত্ৰবোৰ উদ্ধাৰ কৰক: আঁতৰৰ ছাইটৰ সৈতে সংয়োকৃত নহয\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ভুল: %d চাইল্ডে %d ঘূৰাই পথাইছে\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "%d সফলভাৱে ঘূৰাই পথাইছে\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ভুল: %s নথিপত্ৰৰ বিষযে তথ্য় উলিযাব নোৱাৰিলে: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "নথিপত্ৰ %s সলনি কৰা হোৱা নাছিল\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2899,113 +2806,151 @@ msgstr ""
 "নথিপত্ৰ %s সলনি হৈছে ।\n"
 "আপুনি এইটো আপলোড কৰিবলৈ বিচাৰে নেকি?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "নথিপত্ৰৰ সম্পাদনা কৰক "
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "সমাপ্ত কৰা হ'ল"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s ৰ %s পোৱা গৈছে % .2fKB/s, ত, %02d:%02d:%02d est । সময বাকী আছে"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s ৰ %s পোৱা গৈছে, বদলি ইনষ্টল কৰা হৈছে, কিমান সময বাকী আছে অজ্ঞাত"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:804
+#: 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 est । সময বাকী আছে । (%ld ৰ %ld নথিপত্ৰ )"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "নথিপত্ৰৰ নামবোৰ উদ্ধাৰ কৰক ...%s বাইট"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "দৃশ্য়"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "সম্পাদনা কৰক"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "চাওক: আন প্ৰক্ৰিযা এটা বিভক্ত কৰিব নোৱাৰে: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "প্ৰগ্ৰাম চলাইছে: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ৰ সৈতে %s খুলিছে\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s নথিপত্ৰ চাই আছে\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "চাওক: %s: %s নথিপত্ৰ খুলিব নোৱাৰে\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "%s কন্ত্রোলিং টাৰ্মিনেলল খুলিব নোৱাৰে\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr ""
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
+#~ msgid "  Cancel  "
+#~ msgstr "বাতিল কৰক"
+
+#~ msgid "Host: "
+#~ msgstr "আযোজক:"
+
+#~ msgid "User: "
+#~ msgstr "ব্যৱহাৰকৰ্তা:"
+
+#~ msgid "  Close  "
+#~ msgstr "বন্ধ কৰক "
+
+#~ msgid "Add"
+#~ msgstr "য়োগ কৰক "
+
+#~ msgid "Cancel"
+#~ msgstr "বাতিল"
+
+#~ msgid "  Yes  "
+#~ msgstr "হয "
+
+#~ msgid "  No  "
+#~ msgstr "নহয "
+
+#~ msgid "Type:"
+#~ msgstr "প্ৰকাৰ:"
+
+#~ msgid "Network Address"
+#~ msgstr "নেটৱৰ্কৰ ঠিকনা"
+
+#~ msgid "_Edit"
+#~ msgstr "সম্পাদনা কৰক "
+
+#~ msgid "Apply"
+#~ msgstr "প্ৰয়োগ কৰক"
diff --git a/po/az.po b/po/az.po
index e1a41ba..2e570da 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-23 04:09+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-08-24 22:22+0300\n"
 "Last-Translator: Mətin Əmirov <metin karegen com>\n"
 "Language-Team: Azerbaijani <gnome azitt com>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,688 +27,807 @@ msgstr ""
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr ""
 
-#: lib/cache.c:136 lib/local.c:542
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr ""
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:292 lib/misc.c:298 lib/rfc2068.c:263 lib/sshv2.c:997
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr ""
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 ""
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr ""
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: lib/config_file.c:442
+#: 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 ""
 
-#: lib/config_file.c:445
+#: 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:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr ""
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:763
+#: lib/config_file.c:733
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: 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 ""
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr ""
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
+#: lib/fsp.c:189
+#, c-format
+msgid "Error: Cannot upload file %s\n"
 msgstr ""
 
-#: lib/local.c:67 lib/local.c:472
+#: lib/fsp.c:199
 #, c-format
-msgid "Could not change local directory to %s: %s\n"
+msgid "Error: Cannot write to file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:81 lib/local.c:457
+#: lib/fsp.c:237
 #, c-format
-msgid "Could not get current working directory: %s\n"
+msgid "Error: Error closing file: %s\n"
 msgstr ""
 
-#: lib/local.c:179
+#: lib/fsp.c:327
 #, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
 msgstr ""
 
-#: lib/local.c:412
+#: 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 "namə'lum"
+
+#: lib/fsp.c:377
 #, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr ""
 
-#: lib/local.c:449
+#: lib/fsp.c:436
 #, c-format
-msgid "Successfully changed local directory to %s\n"
+msgid "Successfully changed directory to %s\n"
+msgstr ""
+
+#: lib/fsp.c:446
+#, c-format
+msgid "Could not change directory to %s\n"
 msgstr ""
 
-#: lib/local.c:489 lib/local.c:512 src/gtk/transfer.c:907
-#: src/gtk/view_dialog.c:301
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr ""
 
-#: lib/local.c:495
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr ""
 
-#: lib/local.c:518 src/gtk/transfer.c:911 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:535
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr ""
 
-#: lib/local.c:561
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: lib/local.c:568
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/local.c:591
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
+msgid "Could not get current working directory: %s\n"
 msgstr ""
 
-#: lib/local.c:598
+#: lib/local.c:105
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Successfully changed local directory to %s\n"
 msgstr ""
 
-#: lib/local.c:690
-msgid "local filesystem"
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:261 lib/misc.c:268 lib/protocols.c:2514
+#: lib/local.c:238
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:278 lib/protocols.c:2232 lib/sslcommon.c:467
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:286 lib/protocols.c:2160 lib/sslcommon.c:421
+#: lib/local.c:634
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
+msgid "Successfully changed mode of %s to %o\n"
 msgstr ""
 
-#: lib/misc.c:442
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/local.c:641
+#, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/local.c:676
+#, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr ""
+
+#: lib/local.c:683
+#, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr ""
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr ""
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr ""
+
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "yoxdur"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr ""
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "böyüklük"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr ""
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "qrup"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Ümumi"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr ""
 
-#: lib/options.h:38
+#: 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:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr ""
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr ""
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr ""
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr ""
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr ""
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr ""
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr ""
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
+msgstr ""
+
+#: lib/options.h:82
+msgid "Preserve file time"
 msgstr ""
 
-#: lib/options.h:75
+#: lib/options.h:85
+msgid "Preserve file times of transferred files"
+msgstr ""
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr ""
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+msgid "Refresh the listbox after each file is transferred"
 msgstr ""
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr ""
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Gizli faylları göstər"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1048
-#: src/gtk/options_dialog.c:1141
+#: lib/options.h:100
+msgid "Show transfer status in title"
+msgstr ""
+
+#: lib/options.h:102
+msgid "Show the file transfer status in the titlebar"
+msgstr ""
+
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr ""
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr ""
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Şəbəkə"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: lib/options.h:94
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:111
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr ""
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: lib/options.h:135
+#: 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 ""
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr ""
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr ""
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr ""
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr ""
 
-#: lib/options.h:210
+#: lib/options.h:270
 msgid "Local"
 msgstr "Yerli"
 
-#: lib/options.h:211
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
-#: lib/options.h:212 src/gtk/bookmarks.c:855
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Nişan"
 
-#: lib/protocols.c:168 lib/protocols.c:193
-#, c-format
-msgid "File transfer will be throttled to %.2f KB/s\n"
+#: lib/options.h:275
+msgid "FSP"
 msgstr ""
 
-#: lib/protocols.c:322
+#: lib/protocols.c:226
 #, c-format
-msgid "Loading directory listing %s from cache\n"
-msgstr ""
-
-#: lib/protocols.c:467
-#, c-format
-msgid "Error: Cannot write to cache: %s\n"
-msgstr ""
-
-#: lib/protocols.c:499
-#, c-format
-msgid "Error: Could not find bookmark %s\n"
-msgstr ""
-
-#: lib/protocols.c:506
-#, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
-msgstr ""
-
-#: lib/protocols.c:609
-#, c-format
-msgid "The protocol '%s' is currently not supported.\n"
+msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:926 lib/protocols.c:941 lib/protocols.c:1757
-#: lib/protocols.c:1866
+#: lib/protocols.c:379
 #, c-format
-msgid "Looking up %s\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:932 lib/protocols.c:947 lib/protocols.c:1762
-#: lib/protocols.c:1871
+#: lib/protocols.c:390
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:1204 lib/protocols.c:1205 lib/protocols.c:1264
-#: lib/protocols.c:1271 lib/protocols.c:1350 lib/protocols.c:1351
-#: lib/protocols.c:1385
-msgid "unknown"
-msgstr "namə'lum"
-
-#: lib/protocols.c:1780 lib/protocols.c:1823 lib/rfc959.c:589 lib/rfc959.c:736
+#: lib/protocols.c:400
 #, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:1786 lib/protocols.c:1885
+#: lib/protocols.c:450
 #, c-format
-msgid "Trying %s:%d\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:1791 lib/protocols.c:1892
+#: lib/protocols.c:481
 #, c-format
-msgid "Cannot connect to %s: %s\n"
+msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: lib/protocols.c:1847 lib/sshv2.c:895
+#: lib/protocols.c:514
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: lib/protocols.c:1909 lib/protocols.c:2523 lib/rfc959.c:598 lib/rfc959.c:745
+#: lib/protocols.c:521
 #, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1916
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Connected to %s:%d\n"
+msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:2140 lib/protocols.c:2211
+#: lib/protocols.c:1153
 #, c-format
-msgid "Connection to %s timed out\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: lib/protocols.c:2280
+#: lib/protocols.c:1531
 #, c-format
-msgid "Cannot get socket flags: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: lib/protocols.c:2294
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:2420
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr ""
 
-#: lib/protocols.c:2428
+#: lib/pty.c:301
 #, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: lib/pty.c:288
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Vəkil qapısı:"
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
@@ -719,106 +839,90 @@ msgstr ""
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:992
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
-msgstr ""
-
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1077
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr ""
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Xüsusi"
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr ""
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -829,11 +933,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -843,11 +959,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -855,77 +971,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr ""
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
+#, c-format
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Failed to create a IPv4 socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:756
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1422
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr ""
 
-#: lib/rfc959.c:1424
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr ""
@@ -946,206 +1129,190 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr ""
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
 msgstr ""
 
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr ""
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Şifrə:"
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Şifrə:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
 
-#: lib/sshv2.c:304 lib/sshv2.c:329
-msgid "WARNING"
-msgstr "DİQQƏT"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
+msgstr ""
 
-#: lib/sshv2.c:371
-msgid "Error: An incorrect password was entered\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
 msgstr ""
 
-#: lib/sshv2.c:374
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:519
+msgid "Enter SecurID Password:"
 msgstr ""
 
-#: lib/sshv2.c:377
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: lib/sshv2.c:416
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:422
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:431
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:436
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:442
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:447
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:451
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:456
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:461
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:466
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:471
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:475
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:492
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:497
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:510 src/gtk/bookmarks.c:1014 src/gtk/bookmarks.c:1251
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1106
-#: src/gtk/options_dialog.c:1308 src/gtk/transfer.c:2046
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Oldu"
 
-#: lib/sshv2.c:513
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr ""
 
-#: lib/sshv2.c:519
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Səlahiyyət yoxdur"
 
-#: lib/sshv2.c:522
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:525
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: lib/sshv2.c:528
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: lib/sshv2.c:531
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr ""
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: lib/sshv2.c:574
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:632 lib/sshv2.c:1116 lib/sshv2.c:1951 lib/sshv2.c:2044
-#: lib/sshv2.c:2132
+#: 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 ""
 
-#: lib/sshv2.c:638
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:714 lib/sshv2.c:727 lib/sshv2.c:749 lib/sshv2.c:817
-#: lib/sshv2.c:948 lib/sshv2.c:1039 lib/sshv2.c:1107 lib/sshv2.c:1220
-#: lib/sshv2.c:1233 lib/sshv2.c:1246 lib/sshv2.c:1259 lib/sshv2.c:1315
-#: lib/sshv2.c:1380 lib/sshv2.c:1840 lib/sshv2.c:1942 lib/sshv2.c:2035
-#: lib/sshv2.c:2120 lib/sshv2.c:2205
-msgid "Received wrong response from server, disconnecting\n"
-msgstr ""
-
-#: lib/sshv2.c:866
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: lib/sshv2.c:959
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
@@ -1170,7 +1337,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1179,112 +1350,493 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:37 src/gtk/gftp-gtk.c:912 src/gtk/menu-items.c:58
-#: src/gtk/menu-items.c:88 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr ""
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "Tərcüməçilər"
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr ""
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr ""
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr ""
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr ""
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "təmizlə"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr ""
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr ""
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr ""
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr ""
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr ""
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr ""
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr ""
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr ""
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr ""
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr ""
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr ""
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:38
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:65
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:72
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:129 src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:136
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr ""
 
-#: src/gtk/bookmarks.c:466 src/gtk/bookmarks.c:476
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
+msgstr ""
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Yeni Qovluq"
 
-#: src/gtk/bookmarks.c:467
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:477
+#: src/gtk/bookmarks.c:473
+msgid "New Item"
+msgstr ""
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:550
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 
-#: src/gtk/bookmarks.c:551
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:578
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Nişanlar"
 
-#: src/gtk/bookmarks.c:820 src/gtk/bookmarks.c:823
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
@@ -1316,7 +1868,7 @@ msgstr ""
 msgid "Username:"
 msgstr "İstifadəçi Adı:"
 
-#: src/gtk/bookmarks.c:972
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Şifrə:"
 
@@ -1328,1308 +1880,970 @@ msgstr ""
 msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1026 src/gtk/bookmarks.c:1261
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1117
-#: src/gtk/options_dialog.c:1319 src/gtk/transfer.c:2058
-msgid "  Cancel  "
-msgstr ""
-
-#: src/gtk/bookmarks.c:1036 src/gtk/options_dialog.c:1330
-msgid "Apply"
-msgstr "Tədbiq Et"
-
-#: src/gtk/bookmarks.c:1178
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: src/gtk/bookmarks.c:1179
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1180
-msgid "/File/New Folder..."
-msgstr ""
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
+msgstr "Yeni Qovluq"
 
-#: src/gtk/bookmarks.c:1181
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+msgid "/File/New _Item..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1182
-msgid "/File/Delete"
-msgstr ""
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
+msgstr "Sil"
 
-#: src/gtk/bookmarks.c:1183
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+msgid "/File/_Properties..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1184
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1185
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+msgid "/File/_Close"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1196 src/gtk/bookmarks.c:1199
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Nişanları Düzəlt"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:89
-#: src/gtk/menu-items.c:422 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:533
-msgid "Operation canceled\n"
-msgstr ""
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Xüsusi"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Yapışan"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:600
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "İstifadəçi"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "İcra Et"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:601
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Qrup"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Digər"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:69
+#, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1191
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Sil"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr ""
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Bağlan"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Çıx"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Seçənəklər"
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:161
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+msgid "/FTP/Window _1"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+msgid "/FTP/Window _2"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:164 src/gtk/gftp-gtk.c:167 src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:166
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/_Options..."
+#: src/gtk/gftp-gtk.c:275
+msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:173
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:176 src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "Hamısını Seç"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+msgid "/Local/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "Yeni Qovluq"
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+msgid "/Local/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "Yenilə"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:194
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "Hamısını Seç"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:207
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "Yeni Qovluq"
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+msgid "/Remote/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "Yenilə"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Nişanlar"
 
-#: src/gtk/gftp-gtk.c:217
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+msgid "/Bookmarks/Add _Bookmark"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Edit bookmarks"
-msgstr ""
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
+msgstr "Nişanları Düzəlt"
 
-#: src/gtk/gftp-gtk.c:221
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+msgid "/Transfer/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Start Transfer"
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/Stop Transfer"
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:235
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+msgid "/Log/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/View log..."
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Yardım"
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Yardım/Haqqında..."
 
-#: src/gtk/gftp-gtk.c:367
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+msgid "_Host: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:385
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:403
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "İstifadəçi: "
 
-#: src/gtk/gftp-gtk.c:421
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:598 src/gtk/gftp-gtk.c:802 src/gtk/transfer.c:1887
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Fayl adı"
 
-#: src/gtk/gftp-gtk.c:599
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Böyüklük"
 
-#: src/gtk/gftp-gtk.c:602
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Tarix"
 
-#: src/gtk/gftp-gtk.c:603
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:803
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "İrəliləmə"
 
-#: src/gtk/gftp-gtk.c:913 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
-msgid "Connect"
-msgstr "Bağlan"
-
-#: src/gtk/gftp-gtk.c:935
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1170
-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";
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "Yenilə"
+
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "İstifadəçi Adı:"
+
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1172 src/text/gftp-text.c:150
-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"
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
 msgstr ""
 
-#: src/gtk/menu-items.c:59 src/gtk/menu-items.c:89
-msgid "OpenURL"
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:119
-msgid "Connect via URL"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/menu-items.c:119
-msgid "Enter ftp url to connect to"
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
 msgstr ""
 
-#: src/gtk/menu-items.c:152
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "Yenidən adlandır"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/menu-items.c:189 src/gtk/menu-items.c:192
-msgid "Change Filespec"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/menu-items.c:192
-msgid "Enter the new file specification"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/menu-items.c:220 src/gtk/menu-items.c:592 src/gtk/menu-items.c:650
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/menu-items.c:246
-msgid "Save Directory Listing"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:363
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: 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/menu-items.c:382 src/gtk/menu-items.c:385
-msgid "Site"
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
 msgstr ""
 
-#: src/gtk/menu-items.c:385
-msgid "Enter site-specific command"
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "Üstünə yaz"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "Davam et"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "Keç"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "Gedişat"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:484 src/gtk/menu-items.c:518
-msgid "Chdir"
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "Hamısını Seç"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr ""
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:616 src/gtk/menu-items.c:674
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
+msgstr ""
+
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
+msgstr ""
+
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
+msgstr ""
+
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:697
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: src/gtk/menu-items.c:733
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: src/gtk/menu-items.c:737 src/gtk/menu-items.c:742
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr ""
 
-#: src/gtk/menu-items.c:773
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:774 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "Tərcüməçilər"
-
-#: src/gtk/menu-items.c:785
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Haqqında"
 
-#: src/gtk/menu-items.c:834
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr ""
 
-#: src/gtk/menu-items.c:840 src/gtk/view_dialog.c:377
-msgid "  Close  "
+#: src/gtk/menu-items.c:613
+msgid "Compare Windows"
 msgstr ""
 
-#: src/gtk/menu-items.c:922
-msgid "Compare Windows"
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "Yenilə"
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "Yenidən adlandır"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1177
-msgid "Add"
-msgstr "Əlavə Et"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "Ləğv Et"
-
-#: src/gtk/misc-gtk.c:1053
-msgid "  Yes  "
-msgstr ""
-
-#: src/gtk/misc-gtk.c:1063
-msgid "  No  "
-msgstr ""
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:100
-msgid "Mkdir"
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Make Directory"
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Enter name of directory to create"
-msgstr ""
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
+msgstr "Domen"
 
-#: src/gtk/options_dialog.c:917
-msgid "Edit Host"
-msgstr ""
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
+msgstr "Şəbəkə Ünvanı"
 
-#: src/gtk/options_dialog.c:917
-msgid "Add Host"
+#: src/gtk/options_dialog.c:1013
+msgid "N_etmask:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:949 src/gtk/options_dialog.c:1040
-msgid "Domain"
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
 msgstr "Domen"
 
-#: src/gtk/options_dialog.c:969
-msgid "Network Address"
-msgstr "Şəbəkə Ünvanı"
-
-#: src/gtk/options_dialog.c:1002 src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1148
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1184 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "Düzəlt"
-
-#: src/gtk/options_dialog.c:1246 src/gtk/options_dialog.c:1251
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Seçənəklər"
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/rename_dialog.c:111
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr ""
-
-#: src/gtk/transfer.c:166
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: src/gtk/transfer.c:282
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr ""
-
-#: src/gtk/transfer.c:309 src/gtk/transfer.c:1285
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Bağlanılır..."
 
-#: src/gtk/transfer.c:319 src/gtk/transfer.c:1179 src/gtk/transfer.c:1190
-msgid "Enter Password"
-msgstr ""
-
-#: src/gtk/transfer.c:320 src/gtk/transfer.c:1180 src/gtk/transfer.c:1191
-msgid "Please enter your password for this site"
-msgstr ""
-
-#: src/gtk/transfer.c:410
-msgid "Transfer Files"
-msgstr ""
-
-#: src/gtk/transfer.c:418
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/transfer.c:645
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-
-#: src/gtk/transfer.c:702
+#: src/gtk/transfer.c:336
 #, c-format
-msgid "Could not download %s from %s\n"
+msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:732
+#: src/gtk/transfer.c:345
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:1071 src/gtk/transfer.c:1157
-#: src/gtk/transfer.c:1600
-msgid "Skipped"
-msgstr ""
-
-#: src/gtk/transfer.c:841 src/gtk/transfer.c:1133 src/gtk/transfer.c:1161
-msgid "Waiting..."
+msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/gtk/transfer.c:984
+#: src/gtk/transfer.c:352
 #, c-format
-msgid "Error: Child %d returned %d\n"
+msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: src/gtk/transfer.c:987
-#, c-format
-msgid "Child %d returned successfully\n"
-msgstr ""
-
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: src/gtk/transfer.c:999
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1007
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr ""
 
-#: src/gtk/transfer.c:1010
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr ""
 
-#: src/gtk/transfer.c:1074
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr ""
 
-#: src/gtk/transfer.c:1114
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1329
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1359
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1368
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1394
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr ""
-
-#: src/gtk/transfer.c:1472 src/gtk/transfer.c:1494 src/gtk/transfer.c:1528
-#: src/gtk/transfer.c:1568 src/gtk/transfer.c:1621 src/gtk/transfer.c:1680
-msgid "There are no file transfers selected\n"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1512
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1553 src/gtk/transfer.c:1606
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1767 src/gtk/transfer.c:1972 src/gtk/transfer.c:2011
-msgid "Overwrite"
-msgstr "Üstünə yaz"
-
-#: src/gtk/transfer.c:1789 src/gtk/transfer.c:1982 src/gtk/transfer.c:2017
-msgid "Resume"
-msgstr "Davam et"
-
-#: src/gtk/transfer.c:1811 src/gtk/transfer.c:1977
-msgid "Skip"
-msgstr "Keç"
-
-#: src/gtk/transfer.c:1888
-msgid "Local Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1889
-msgid "Remote Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1890
-msgid "Action"
-msgstr "Gedişat"
-
-#: src/gtk/transfer.c:1892
-msgid "Download Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1892
-msgid "Upload Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1918
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-
-#: src/gtk/transfer.c:2023
-msgid "Skip File"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/gtk/transfer.c:2033
-msgid "Select All"
-msgstr "Hamısını Seç"
-
-#: src/gtk/transfer.c:2039
-msgid "Deselect All"
+#: 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 ""
 
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Göstər"
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Düzəlt"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr ""
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr ""
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr ""
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr ""
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr ""
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr ""
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr ""
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr "təmizlə"
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr ""
-
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr ""
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr ""
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr ""
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr ""
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr ""
-
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr ""
-
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr ""
-
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr ""
-
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr ""
-
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr ""
-
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr ""
-
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr ""
-
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr ""
-
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr ""
-
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr ""
-
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr ""
-
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr ""
-
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr ""
-
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr ""
-
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr ""
-
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr ""
-
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:89
-msgid "set"
-msgstr ""
-
-#: src/text/gftp-text.c:90
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-
-#: src/text/gftp-text.c:148
-msgid ""
-">.\n"
-"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 ""
-
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr ""
-
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:698
-#: src/text/gftp-text.c:716 src/text/gftp-text.c:737 src/text/gftp-text.c:811
-msgid "Error: Not connected to a remote site\n"
-msgstr ""
-
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:744
-msgid "usage: mget <filespec>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:818
-msgid "usage: mput <filespec>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:956
+#: src/text/gftp-text.c:166
 #, c-format
-msgid "Could not download %s\n"
-msgstr ""
-
-#: src/text/gftp-text.c:963
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr ""
-
-#: src/text/gftp-text.c:1030
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-
-#: src/text/gftp-text.c:1086
-msgid "usage: set [variable = value]\n"
+msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1100
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr ""
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "İstifadəçi Adı:"
 
-#: src/text/gftp-text.c:1107
+#: src/text/textui.c:158
 #, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
-#: src/text/gftp-text.c:1135
-msgid "Invalid argument\n"
-msgstr ""
+#~ msgid "WARNING"
+#~ msgstr "DİQQƏT"
 
-#: src/text/gftp-text.c:1160
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr ""
+#~ msgid "Apply"
+#~ msgstr "Tədbiq Et"
 
-#: src/text/gftp-text.c:1238
-msgid "Clear the directory cache\n"
-msgstr ""
+#~ msgid "Add"
+#~ msgstr "Əlavə Et"
 
+#~ msgid "Cancel"
+#~ msgstr "Ləğv Et"
diff --git a/po/be.po b/po/be.po
index c1a7b32..922f0f6 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,10 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 2.0.14\n"
-"POT-Creation-Date: 2003-05-23 20:08+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-06-23 01:17+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab mail by>\n"
 "Language-Team: Belarusian <i18n mova org>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,734 +22,925 @@ msgstr ""
 msgid "Invalid URL %s\n"
 msgstr "Недапушчальны URL %s\n"
 
-#: lib/cache.c:48 lib/cache.c:62
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Памылка: недапушчальны радок %s у файле ключоў кэшу\n"
 
-#: lib/cache.c:100 lib/local.c:542
+#: 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"
 
-#: lib/cache.c:113 lib/cache.c:207 lib/cache.c:296 lib/local.c:126
-#: lib/local.c:178 lib/misc.c:244 lib/misc.c:251
-#, c-format
-msgid "Error: Cannot open local file %s: %s\n"
-msgstr "Памылка: немагчыма адчыніць мясцовы файл %s: %s\n"
-
-#: lib/cache.c:128
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Памылка: немагчыма адчыніць часовы файл: %s\n"
 
-#: lib/cache.c:150 lib/cache.c:197 lib/local.c:98 lib/local.c:223
-#: lib/misc.c:275 lib/misc.c:281 lib/rfc2068.c:282 lib/rfc2068.c:404
-#: lib/sshv2.c:990
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Памылка зачыненьня апісальніка файла:%s\n"
 
-#: lib/cache.c:223 lib/local.c:137 lib/local.c:146 lib/local.c:198
+#: 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 "Памылка: немагчыма зрабіць пошук (seek) па файлу %s: %s\n"
 
-#: lib/config_file.c:119 lib/config_file.c:640
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr "Памылка: немагчыма адчыніць мясцовы файл %s: %s\n"
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr ""
+
+#: 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"
 
-#: lib/config_file.c:128
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Увага! Немагчыма адшукаць файл галоўнай закладкі %s\n"
 
-#: lib/config_file.c:139 lib/config_file.c:646
+#: 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"
 
-#: lib/config_file.c:224
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Заўвага gFTP: прапускаецца радок %d у файле закладак %s\n"
 
-#: lib/config_file.c:249
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Заўвага gFTP: радку %d не стае довадаў\n"
 
-#: lib/config_file.c:414
+#: 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=.маёнтак ці dont_use_proxy=нумар_сеткі/маска"
+"Гэты падзел задае вузлы, якія знаходзяцца ў мясцовай сетке й да якіх ня "
+"трэба зьвяртацца праз упаўнаважаны паслужнік (калі ён даступны).Правапіс: "
+"dont_use_proxy=.маёнтак ці dont_use_proxy=нумар_сеткі/маска"
 
-#: lib/config_file.c:417
+#: 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:492 lib/config_file.c:711
+#: 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:503
+#: 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:513
+#: 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:515
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr "Вы сапраўды жадаеце зрабіць усталёўку?\n"
 
-#: lib/config_file.c:524 lib/config_file.c:717
+#: 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:563
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:569
+#: 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:576
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Памылка gFTP: дрэнная назва файла часопісу %s\n"
 
-#: lib/config_file.c:582
+#: 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:636
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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. Аўтарскія правы © 1998-2003 Brian Masney <masneyb gftp "
-"org>. Увага! Усе камэнтары, якія Вы дабавіце ў гэты файл, БУДУЦЬ перапісаны."
+"Файл закладак для  gFTP. Аўтарскія правы © 1998-2003 Brian Masney "
+"<masneyb gftp org>. Увага! Усе камэнтары, якія Вы дабавіце ў гэты файл, "
+"БУДУЦЬ перапісаны."
+
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
 
-#: lib/config_file.c:724
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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. Аўтарскія правы © 1998-2003 Brian Masney "
+"<masneyb gftp org>. Увага! Усе камэнтары, якія Вы дабавіце ў гэты файл, "
+"БУДУЦЬ перапісаны."
 
-#: lib/config_file.c:995
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<невядома>"
 
-#: lib/config_file.c:1057 lib/config_file.c:1088 lib/config_file.c:1112
+#: 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 ""
 
-#: lib/local.c:67 lib/local.c:472
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Немагчыма перайсьці ў тэчку %s: %s\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Памылка: немагчыма адчыніць мясцовы файл %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:458
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Немагчыма вызначыць бягучую працоўную тэчку: %s\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Памылка: немагчыма зрабіць пошук (seek) па файлу %s: %s\n"
 
-#: lib/local.c:189
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Памылка: немагчыма абрэзаць мясцовы файл %s: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Памылка зачыненьня апісальніка файла:%s\n"
 
-#: lib/local.c:415
+#: lib/fsp.c:327
 #, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr ""
+
+#: 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 "невядома"
+
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Немагчыма атрымаць сьпіс файлаў мясцовай тэчкі %s: %s\n"
 
-#: lib/local.c:452
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "Пасьпяховы пераход у мясцовую тэчку %s\n"
 
-#: lib/local.c:489 lib/local.c:512 src/gtk/transfer.c:903
-#: src/gtk/view_dialog.c:301
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Немагчыма перайсьці ў тэчку %s: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Пасьпяхова выдалены(а) %s\n"
 
-#: lib/local.c:495
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Памылка: немагчыма выдаліць тэчку %s: %s\n"
 
-#: lib/local.c:518 src/gtk/transfer.c:907 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Памылка: немагчыма выдаліць файл %s: %s\n"
 
-#: lib/local.c:535
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Пасьпяхова створана тэчка %s\n"
 
-#: lib/local.c:561
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Пасьпяхова перайменаваны(а) %s на %s\n"
 
-#: lib/local.c:568
+#: 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/local.c:591
-#, c-format
-msgid "Successfully changed mode of %s to %d\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 msgstr ""
 
-#: lib/local.c:598
-#, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 msgstr ""
 
-#: lib/local.c:688
-msgid "local filesystem"
-msgstr ""
+#: lib/local.c:66
+#, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr "Немагчыма вызначыць бягучую працоўную тэчку: %s\n"
 
-#: lib/misc.c:261 lib/protocols.c:2030
+#: lib/local.c:105
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
-msgstr ""
+msgid "Successfully changed local directory to %s\n"
+msgstr "Пасьпяховы пераход у мясцовую тэчку %s\n"
 
-#: lib/misc.c:269 lib/protocols.c:1960
+#: lib/local.c:112
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
-msgstr ""
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Немагчыма перайсьці ў тэчку %s: %s\n"
 
-#: lib/misc.c:357
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
-msgstr "выкарыстаньне: gftp [[пратакол://][карыстальнік[:пароль] ]вузел[:порт][/тэчка]]\n"
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Памылка: немагчыма абрэзаць мясцовы файл %s: %s\n"
 
-#: lib/misc.c:386
+#: lib/local.c:424
 #, c-format
-msgid "gFTP Error: Cannot find file %s in %s or %s\n"
-msgstr "Памылка gFTP: немагчыма адшукаць файл %s у %s ці %s\n"
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Немагчыма атрымаць сьпіс файлаў мясцовай тэчкі %s: %s\n"
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Пасьпяховы пераход у мясцовую тэчку %s\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Памылка: немагчыма перайменаваць %s на %s: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Пасьпяховы пераход у мясцовую тэчку %s\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Памылка: немагчыма перайменаваць %s на %s: %s\n"
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr ""
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr ""
+
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "няма"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "файл"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "памер"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "карыстальнік"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "група"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "дзень/час"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "правы"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Агульнае"
 
-#: lib/options.h:36
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Праглядальнік:"
 
-#: lib/options.h:37
+#: 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:39
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Рэдактар:"
 
-#: lib/options.h:40
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Дапомная праграма для рэдагаваньня файлаў."
 
-#: lib/options.h:41
-msgid "Startup Directory:"
+#: lib/options.h:48
+msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:43
-msgid "The default directory gFTP will go to on startup"
+#: lib/options.h:50
+msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: lib/options.h:44
-msgid "Max Log Window Size:"
+#: lib/options.h:52
+msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:46
-msgid "The maximum size of the log window in bytes for the GTK+ port"
+#: lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
+msgstr ""
+
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
+msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:49
+#: lib/options.h:63
+#, fuzzy
+msgid "The number of seconds to keep cache entries before they expire."
+msgstr "Колькасьць сэкундаў між спробамі"
+
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:52
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Рабіць адну перадачу за раз"
 
-#: lib/options.h:54
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Рабіць толькі адну перадачу за раз?"
 
-#: lib/options.h:55
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Перазапісываць (дапомна)"
 
-#: lib/options.h:57
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:77
+msgid "Preserve file permissions"
+msgstr ""
+
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
+msgstr ""
+
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr ""
+
+#: lib/options.h:85
+msgid "Preserve file times of transferred files"
+msgstr ""
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Абнаўляць пасьля кожнае перадачы"
 
-#: lib/options.h:61
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Абнаўляць сьпіс пасьля кожнае перадачы файлаў"
 
-#: lib/options.h:63
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Месьціць тэчкі перад файламі"
 
-#: lib/options.h:65
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Зьмяшчаць тэчкі раней чым файлы"
 
-#: lib/options.h:66
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Паказываць схаваныя файлы"
 
-#: lib/options.h:68
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Паказываць у сьпісах схаваныя файлы"
 
-#: lib/options.h:70 src/gtk/options_dialog.c:1007
-#: src/gtk/options_dialog.c:1098
+#: lib/options.h:100
+#, fuzzy
+msgid "Show transfer status in title"
+msgstr "Рабіць адну перадачу за раз"
+
+#: lib/options.h:102
+#, fuzzy
+msgid "Show the file transfer status in the titlebar"
+msgstr "Паказываць у сьпісах схаваныя файлы"
+
+#: lib/options.h:103
+#, fuzzy
+msgid "Start file transfers"
+msgstr "Абнаўляць пасьля кожнае перадачы"
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr ""
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Сетка"
 
-#: lib/options.h:72
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: lib/options.h:74
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:76
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Спробы далучыцца:"
 
-#: lib/options.h:78
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: lib/options.h:80
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:82
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Колькасьць сэкундаў між спробамі"
 
-#: lib/options.h:83
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Найбольшая хуткасьць Кб/с:"
 
-#: lib/options.h:85
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:88
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Дапомны пратакол:"
 
-#: lib/options.h:90
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Задае дапомны пратакол для выкарыстаньня"
 
-#: lib/options.h:94
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:97
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:100
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: lib/options.h:103
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:106
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:109
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: lib/options.h:112
+#: 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 ""
 
-#: lib/options.h:116 lib/options.h:122
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: lib/options.h:119 lib/options.h:125
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: lib/options.h:129 lib/options.h:147
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:132 lib/options.h:150
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:135 lib/options.h:153
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:138 lib/options.h:156
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:141 lib/options.h:159
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:144 lib/options.h:162
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:165
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Колер загадаў, дасланых паслужніку"
 
-#: lib/options.h:168
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Колер загадаў, атрыманых ад паслужніка"
 
-#: lib/options.h:171
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Колер паведамленьняў пра памылкі"
 
-#: lib/options.h:174
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: lib/options.h:180 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr ""
 
-#: lib/options.h:181 lib/rfc2068.c:25
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr ""
 
-#: lib/options.h:182
+#: lib/options.h:265 lib/options.h:267
+msgid "HTTPS"
+msgstr ""
+
+#: lib/options.h:270
 msgid "Local"
 msgstr ""
 
-#: lib/options.h:183
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
-#: lib/options.h:184
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Закладка"
 
-#: lib/protocols.c:150 lib/protocols.c:174
+#: lib/options.h:275
+msgid "FSP"
+msgstr ""
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:303
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:371
+#: lib/protocols.c:390
 #, c-format
-msgid "Error: Cannot write to cache: %s\n"
-msgstr "Памылка: немагчыма запісаць у кэш: %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
+msgstr ""
 
-#: lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
-msgid "Error: Could not find bookmark %s\n"
-msgstr "Памылка: немагчыма адшукаць закладку %s\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
+msgstr ""
 
-#: lib/protocols.c:409
+#: lib/protocols.c:450
 #, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:789 lib/protocols.c:804 lib/protocols.c:1602
-#: lib/protocols.c:1711
+#: lib/protocols.c:481
 #, c-format
-msgid "Looking up %s\n"
-msgstr "Пошук %s\n"
+msgid "Error: Cannot write to cache: %s\n"
+msgstr "Памылка: немагчыма запісаць у кэш: %s\n"
 
-#: lib/protocols.c:795 lib/protocols.c:810 lib/protocols.c:1607
-#: lib/protocols.c:1716
+#: lib/protocols.c:514
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Немагчыма адшукаць вузел %s: %s\n"
-
-#: lib/protocols.c:1052 lib/protocols.c:1053 lib/protocols.c:1112
-#: lib/protocols.c:1119 lib/protocols.c:1198 lib/protocols.c:1199
-#: lib/protocols.c:1233
-msgid "unknown"
-msgstr "невядома"
+msgid "Error: Could not find bookmark %s\n"
+msgstr "Памылка: немагчыма адшукаць закладку %s\n"
 
-#: lib/protocols.c:1625 lib/protocols.c:1668 lib/rfc959.c:578 lib/rfc959.c:714
+#: lib/protocols.c:521
 #, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1631 lib/protocols.c:1730
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Спроба %s:%d\n"
-
-#: lib/protocols.c:1636 lib/protocols.c:1737
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Немагчыма далучыцца да %s: %s\n"
-
-#: lib/protocols.c:1692 lib/sshv2.c:859
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:1752
+#: lib/protocols.c:1153
 #, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Усталявана злучэньне з %s:%d\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:1940 lib/protocols.c:2010
+#: lib/protocols.c:1531
 #, c-format
-msgid "Connection to %s timed out\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: lib/protocols.c:2078
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot get socket flags: %s\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:2092
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
+#, fuzzy, c-format
+msgid "Error: Cannot set close on exec flag: %s\n"
+msgstr "Памылка: немагчыма зрабіць пошук (seek) па файлу %s: %s\n"
+
+#: lib/pty.c:301
+#, fuzzy, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Немагчыма далучыцца да %s: %s\n"
+
+#: lib/pty.c:309
 #, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
+msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/protocols.c:2227
+#: lib/pty.c:338
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/protocols.c:2236
+#: lib/pty.c:354
 #, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:28 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: lib/rfc2068.c:30 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: lib/rfc2068.c:31 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr ""
 
-#: lib/rfc2068.c:33 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:34 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:37 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
-#: lib/rfc2068.c:41
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr ""
 
-#: lib/rfc2068.c:43
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:277 lib/rfc959.c:552 lib/sshv2.c:985
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
-msgid "Disconnecting from site %s\n"
+msgid ""
+"Received wrong response from server, disconnecting\n"
+"Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:334
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
-msgid "Starting the file transfer at offset %lld\n"
+msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:339
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: lib/rfc2068.c:359
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:412
-msgid "Finished retrieving data\n"
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
+msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: lib/rfc2068.c:459 lib/sshv2.c:1070
-msgid "Retrieving directory listing...\n"
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr ""
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr ""
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Электронны адрас:"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -758,11 +951,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: lib/rfc959.c:69
+#: 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. "
@@ -772,11 +977,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:71
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:73
+#: 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 "
@@ -784,77 +989,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Перадаваць файлы ў ASCII рэжыме"
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:303 lib/rfc959.c:312 lib/rfc959.c:323
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
 msgstr ""
 
-#: lib/rfc959.c:607 lib/rfc959.c:617
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:632 lib/rfc959.c:776
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:644 lib/rfc959.c:665 lib/rfc959.c:801
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:655 lib/rfc959.c:791
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:674 lib/rfc959.c:810
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:725
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:754 lib/rfc959.c:763
+#: lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:820
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:889
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1368
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "усяго"
 
-#: lib/rfc959.c:1370
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: 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 ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr ""
@@ -875,1361 +1147,1513 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr ""
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: lib/sshv2.c:43
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:44
-msgid "Use ssh-askpass utility"
-msgstr ""
-
-#: lib/sshv2.c:46
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
 msgstr ""
 
-#: lib/sshv2.c:48
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:252
-#, c-format
-msgid "Running program %s\n"
-msgstr ""
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Увядізце пароль"
 
-#: lib/sshv2.c:298 lib/sshv2.c:323
-msgid "WARNING"
-msgstr "УВАГА"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Увядізце пароль"
 
-#: lib/sshv2.c:365
-msgid "Error: An incorrect password was entered\n"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
 
-#: lib/sshv2.c:368
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
 
-#: lib/sshv2.c:371
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Увядізце пароль"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "Увядізце пароль"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: lib/sshv2.c:410
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:416
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:425
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:430
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:436
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:441
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:445
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:450
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:455
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:460
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:465
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:469
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:486
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:491
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:504 src/gtk/bookmarks.c:1064 src/gtk/bookmarks.c:1301
-#: src/gtk/chmod_dialog.c:280 src/gtk/options_dialog.c:1065
-#: src/gtk/options_dialog.c:1237 src/gtk/transfer.c:2034
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr ""
 
-#: lib/sshv2.c:507
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF (канец файла)"
 
-#: lib/sshv2.c:510
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Няма такога файла ці тэчкі"
 
-#: lib/sshv2.c:513
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Памылка"
 
-#: lib/sshv2.c:519
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Дрэннае паведамленьне"
 
-#: lib/sshv2.c:522
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: lib/sshv2.c:525
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr ""
 
-#: lib/sshv2.c:528
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Дзеяньне непадтрымліваецца"
 
-#: lib/sshv2.c:531
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: lib/sshv2.c:568
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:620 lib/sshv2.c:1109 lib/sshv2.c:1945 lib/sshv2.c:2038
-#: lib/sshv2.c:2126
+#: 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 ""
 
-#: lib/sshv2.c:681 lib/sshv2.c:694 lib/sshv2.c:716 lib/sshv2.c:784
-#: lib/sshv2.c:931 lib/sshv2.c:1032 lib/sshv2.c:1100 lib/sshv2.c:1214
-#: lib/sshv2.c:1227 lib/sshv2.c:1240 lib/sshv2.c:1253 lib/sshv2.c:1309
-#: lib/sshv2.c:1374 lib/sshv2.c:1834 lib/sshv2.c:1936 lib/sshv2.c:2029
-#: lib/sshv2.c:2114 lib/sshv2.c:2199
-msgid "Received wrong response from server, disconnecting\n"
+#: lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:830
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: lib/sshv2.c:874
+#: lib/sshv2.c:1212
 #, c-format
-msgid "Cannot create a socket pair: %s\n"
+msgid "Successfully logged into SSH server %s\n"
+msgstr ""
+
+#: lib/sslcommon.c:31
+msgid "SSL Engine"
+msgstr ""
+
+#: lib/sslcommon.c:34
+msgid "SSL Entropy File:"
 msgstr ""
 
-#: lib/sshv2.c:896
+#: lib/sslcommon.c:36
+msgid "SSL entropy file"
+msgstr ""
+
+#: lib/sslcommon.c:37
+msgid "Entropy Seed Length:"
+msgstr ""
+
+#: lib/sslcommon.c:39
+msgid "The maximum number of bytes to seed the SSL engine with"
+msgstr ""
+
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
-msgid "Error: Cannot execute ssh: %s\n"
+msgid ""
+"Error with certificate at depth: %i\n"
+"Issuer = %s\n"
+"Subject = %s\n"
+"Error %i:%s\n"
+msgstr ""
+
+#: lib/sslcommon.c:129
+msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sshv2.c:943
+#: lib/sslcommon.c:196
 #, c-format
-msgid "Successfully logged into SSH server %s\n"
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
+msgstr ""
+
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sshv2.c:949
+#: lib/sslcommon.c:312
+msgid "Error loading default SSL certificates\n"
+msgstr ""
+
+#: lib/sslcommon.c:324
+msgid "Error setting cipher list (no valid ciphers)\n"
+msgstr ""
+
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
+msgid "Error: SSL engine was not initialized\n"
+msgstr ""
+
+#: lib/sslcommon.c:361
+msgid "Error setting up SSL connection (BIO object)\n"
+msgstr ""
+
+#: lib/sslcommon.c:371
+msgid "Error setting up SSL connection (SSL object)\n"
+msgstr ""
+
+#: lib/sslcommon.c:392
+#, fuzzy, c-format
+msgid "Error with peer certificate: %s\n"
+msgstr "Памылка: немагчыма запісаць у кэш: %s\n"
+
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:65
 #, c-format
-msgid "Cannot fork another process: %s\n"
+msgid "Waiting %d seconds until trying to connect again\n"
 msgstr ""
 
-#: src/text/gftp-text.c:30
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr ""
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr ""
 
-#: src/text/gftp-text.c:31
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr ""
 
-#: src/text/gftp-text.c:32
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr ""
 
-#: src/text/gftp-text.c:33
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 
-#: src/text/gftp-text.c:34
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr ""
 
-#: src/text/gftp-text.c:35
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 
-#: src/text/gftp-text.c:36
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr ""
 
-#: src/text/gftp-text.c:37 src/text/gftp-text.c:39
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr ""
 
-#: src/text/gftp-text.c:38
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr ""
 
-#: src/text/gftp-text.c:40
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr ""
 
-#: src/text/gftp-text.c:41
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr ""
 
-#: src/text/gftp-text.c:42
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr ""
 
-#: src/text/gftp-text.c:43
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr ""
 
-#: src/text/gftp-text.c:44
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr ""
 
-#: src/text/gftp-text.c:45
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr ""
 
-#: src/text/gftp-text.c:46
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr ""
 
-#: src/text/gftp-text.c:47
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr ""
 
-#: src/text/gftp-text.c:48
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr ""
 
-#: src/text/gftp-text.c:49 src/text/gftp-text.c:73
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr ""
 
-#: src/text/gftp-text.c:50
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr ""
 
-#: src/text/gftp-text.c:51
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr ""
 
-#: src/text/gftp-text.c:52
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr ""
 
-#: src/text/gftp-text.c:53 src/text/gftp-text.c:55
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr ""
 
-#: src/text/gftp-text.c:54
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr ""
 
-#: src/text/gftp-text.c:56
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr ""
 
-#: src/text/gftp-text.c:57
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr ""
 
-#: src/text/gftp-text.c:58
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr ""
 
-#: src/text/gftp-text.c:59
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr ""
 
-#: src/text/gftp-text.c:60
-msgid "lls"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
 msgstr ""
 
-#: src/text/gftp-text.c:61
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr ""
 
-#: src/text/gftp-text.c:62
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr ""
 
-#: src/text/gftp-text.c:63
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr ""
 
-#: src/text/gftp-text.c:64
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr ""
 
-#: src/text/gftp-text.c:65
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr ""
 
-#: src/text/gftp-text.c:66
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr ""
 
-#: src/text/gftp-text.c:67
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr ""
 
-#: src/text/gftp-text.c:68
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr ""
 
-#: src/text/gftp-text.c:69
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr ""
 
-#: src/text/gftp-text.c:70
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr ""
 
-#: src/text/gftp-text.c:71
-msgid "Shows the directory listing for the current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:72
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr ""
 
-#: src/text/gftp-text.c:74
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr ""
 
-#: src/text/gftp-text.c:75
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr ""
 
-#: src/text/gftp-text.c:76
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr ""
 
-#: src/text/gftp-text.c:77 src/text/gftp-text.c:81
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr ""
 
-#: src/text/gftp-text.c:78
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr ""
 
-#: src/text/gftp-text.c:79
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr ""
 
-#: src/text/gftp-text.c:80
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr ""
 
-#: src/text/gftp-text.c:82
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr ""
 
-#: src/text/gftp-text.c:83
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr ""
 
-#: src/text/gftp-text.c:84
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr ""
 
-#: src/text/gftp-text.c:85
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr ""
 
-#: src/text/gftp-text.c:86
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr ""
 
-#: src/text/gftp-text.c:87
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr ""
 
-#: src/text/gftp-text.c:88
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr ""
 
-#: src/text/gftp-text.c:89
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr ""
 
-#: src/text/gftp-text.c:90
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr ""
 
-#: src/text/gftp-text.c:91
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-
-#: src/text/gftp-text.c:149
-msgid ""
-">.\n"
-"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 ""
-
-#: src/text/gftp-text.c:151 src/gtk/gftp-gtk.c:1114
+#: src/uicommon/gftpui.c:1002
 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 ""
-
-#: src/text/gftp-text.c:232
-msgid "Error: Command not recognized\n"
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: src/text/gftp-text.c:327
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
+#: src/uicommon/gftpui.c:1004
+msgid "site"
 msgstr ""
 
-#: src/text/gftp-text.c:334 src/gtk/dnd.c:115 src/gtk/menu-items.c:120
-#, c-format
-msgid "Could not parse URL %s\n"
-msgstr ""
-
-#: src/text/gftp-text.c:385 src/gtk/menu-items.c:776
-msgid "Translated by"
-msgstr ""
-
-#: src/text/gftp-text.c:408 src/text/gftp-text.c:424 src/text/gftp-text.c:454
-#: src/text/gftp-text.c:477 src/text/gftp-text.c:499 src/text/gftp-text.c:523
-#: src/text/gftp-text.c:551 src/text/gftp-text.c:584 src/text/gftp-text.c:672
-#: src/text/gftp-text.c:690 src/text/gftp-text.c:711 src/text/gftp-text.c:784
-msgid "Error: Not connected to a remote site\n"
-msgstr ""
-
-#: src/text/gftp-text.c:429 src/text/gftp-text.c:435
-msgid "usage: chdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:461
-msgid "usage: mkdir <new directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:483
-msgid "usage: rmdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:505
-msgid "usage: delete <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:533
-msgid "usage: rename <old name> <new name>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:561
-msgid "usage: chmod <mode> <file>\n"
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
 msgstr ""
 
-#: src/text/gftp-text.c:717
-msgid "usage: mget <filespec>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:790
-msgid "usage: mput <filespec>\n"
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
 msgstr ""
 
-#: src/text/gftp-text.c:924
+#: src/uicommon/gftpui.c:1304
 #, c-format
-msgid "Could not download %s\n"
-msgstr "Немагчыма выгрузіць %s\n"
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Пасьпяхова пераданы %s прыблізна з %.2f Кб/с\n"
 
-#: src/text/gftp-text.c:931
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Successfully transferred %s\n"
-msgstr "Пасьпяхова пераданы %s\n"
-
-#: src/text/gftp-text.c:985
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-
-#: src/text/gftp-text.c:1041
-msgid "usage: set [variable = value]\n"
+msgid "Skipping file %s on host %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1055
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgid "Stopping the transfer on host %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1062
+#: src/uicommon/gftpui.c:1505
 #, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr ""
+msgid "Could not download %s from %s\n"
+msgstr "Немагчыма выгрузіць %s з %s\n"
 
-#: src/text/gftp-text.c:1190
-msgid "Clear the directory cache\n"
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
 msgstr ""
 
-#: src/gtk/bookmarks.c:37 src/gtk/gftp-gtk.c:903 src/gtk/menu-items.c:66
-#: src/gtk/menu-items.c:96 src/gtk/misc-gtk.c:481 src/gtk/misc-gtk.c:489
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:38
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:64
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:128 src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:135
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr ""
 
-#: src/gtk/bookmarks.c:498 src/gtk/bookmarks.c:508
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
+msgstr ""
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr ""
 
-#: src/gtk/bookmarks.c:499
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:509
+#: src/gtk/bookmarks.c:473
+msgid "New Item"
+msgstr ""
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:593
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
-msgstr ""
+"%s and all its children?"
+msgstr "Вы на самой справе жадаеце выдаліць %ld файл(а,аў) і %ld тэчку(і,ак)?"
 
-#: src/gtk/bookmarks.c:594
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Выдаліць закладку"
 
-#: src/gtk/bookmarks.c:621
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr ""
 
-#: src/gtk/bookmarks.c:861 src/gtk/bookmarks.c:864
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
-#: src/gtk/bookmarks.c:882 src/gtk/bookmarks.c:1262 src/gtk/chmod_dialog.c:186
-#: src/gtk/gftp-gtk.c:1099 src/gtk/menu-items.c:759 src/gtk/misc-gtk.c:949
-#: src/gtk/misc-gtk.c:1073 src/gtk/options_dialog.c:1206
-#: src/gtk/view_dialog.c:330
-msgid "gFTP Icon"
-msgstr ""
-
-#: src/gtk/bookmarks.c:897
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:912
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:925
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:942
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:966
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:979
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:992
-msgid "Remote SSH sftp path:"
-msgstr ""
-
-#: src/gtk/bookmarks.c:1009
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1022
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1036
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1050
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1076 src/gtk/bookmarks.c:1311
-#: src/gtk/chmod_dialog.c:292 src/gtk/options_dialog.c:1076
-#: src/gtk/options_dialog.c:1248 src/gtk/transfer.c:2046
-msgid "  Cancel  "
-msgstr ""
-
-#: src/gtk/bookmarks.c:1086 src/gtk/options_dialog.c:1259
-msgid "Apply"
-msgstr ""
-
-#: src/gtk/bookmarks.c:1226
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1227
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1228
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+msgid "/File/New _Folder..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1229
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+msgid "/File/New _Item..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1230
-msgid "/File/Delete"
-msgstr ""
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
+msgstr "Выдаліць"
 
-#: src/gtk/bookmarks.c:1231
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+msgid "/File/_Properties..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1233
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+msgid "/File/_Close"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1244 src/gtk/bookmarks.c:1247
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:97
-#: src/gtk/menu-items.c:432 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:532
-msgid "Operation canceled\n"
-msgstr ""
-
-#: src/gtk/chmod_dialog.c:158 src/gtk/chmod_dialog.c:164
-#: src/gtk/chmod_dialog.c:169
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:189
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:199
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:207
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:211
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:215
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:219 src/gtk/gftp-gtk.c:591
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Карыстальнік"
 
-#: src/gtk/chmod_dialog.c:227 src/gtk/chmod_dialog.c:247
-#: src/gtk/chmod_dialog.c:267
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Чытаньне"
 
-#: src/gtk/chmod_dialog.c:231 src/gtk/chmod_dialog.c:251
-#: src/gtk/chmod_dialog.c:271
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Запіс"
 
-#: src/gtk/chmod_dialog.c:235 src/gtk/chmod_dialog.c:255
-#: src/gtk/chmod_dialog.c:275
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Выкананьне"
 
-#: src/gtk/chmod_dialog.c:239 src/gtk/gftp-gtk.c:592
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Група"
 
-#: src/gtk/chmod_dialog.c:259
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Іншае"
 
-#: src/gtk/delete_dialog.c:164
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Вы на самой справе жадаеце выдаліць %ld файл(а,аў) і %ld тэчку(і,ак)?"
 
-#: src/gtk/delete_dialog.c:166
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "Вы на самой справе жадаеце выдаліць %ld файл(а,аў) і %ld тэчку(і,ак)?"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "Вы на самой справе жадаеце выдаліць %ld файл(а,аў) і %ld тэчку(і,ак)?"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:184 src/gtk/options_dialog.c:1139
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: src/gtk/dnd.c:56
-#, c-format
-msgid "Drag-N-Drop: Ignoring url %s: Not a valid url\n"
-msgstr ""
-
-#: src/gtk/dnd.c:137 src/gtk/dnd.c:229
-msgid "Drag-N-Drop"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
 msgstr ""
 
-#: src/gtk/dnd.c:241
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:117
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:117
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Выбары"
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:161
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+msgid "/FTP/Window _1"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+msgid "/FTP/Window _2"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:164 src/gtk/gftp-gtk.c:167 src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:166
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/_Options..."
+#: src/gtk/gftp-gtk.c:275
+msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:173
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:176 src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "Вылучыць усе"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Change Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
+msgstr "Стварыць тэчку"
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Make Directory..."
+#: src/gtk/gftp-gtk.c:297
+msgid "/Local/_New Folder..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+msgid "/Local/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "Абнавіць"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:194
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "Вылучыць усе"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:207
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Change Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
+msgstr "Стварыць тэчку"
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Make Directory..."
+#: src/gtk/gftp-gtk.c:324
+msgid "/Remote/_New Folder..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+msgid "/Remote/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "Абнавіць"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Закладкі"
 
-#: src/gtk/gftp-gtk.c:217
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Закладкі/tearoff"
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Закладкі/Дадаць закладку"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Закладкі/Рэдагаваць закладкі"
 
-#: src/gtk/gftp-gtk.c:221
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Закладкі/sep"
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
+msgstr "/Сродкі/tearoff"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Start Transfer"
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/Stop Transfer"
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:235
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
+msgstr "/Сродкі/tearoff"
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/View log..."
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Сродкі"
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Сродкі/tearoff"
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Сродкі/Па_раўнаньне вокнаў"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Сродкі/А_чышчэньне кэшу"
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Даведка"
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Даведка/tearoff"
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Даведка/Пра..."
 
-#: src/gtk/gftp-gtk.c:358
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Вузел: "
 
-#: src/gtk/gftp-gtk.c:376
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порт: "
 
-#: src/gtk/gftp-gtk.c:394
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Карыстальнік: "
 
-#: src/gtk/gftp-gtk.c:412
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Пароль: "
 
-#: src/gtk/gftp-gtk.c:589 src/gtk/gftp-gtk.c:793 src/gtk/transfer.c:1875
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Назва"
 
-#: src/gtk/gftp-gtk.c:590
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Памер"
 
-#: src/gtk/gftp-gtk.c:593
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Дзень і час"
 
-#: src/gtk/gftp-gtk.c:594
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Правы"
 
-#: src/gtk/gftp-gtk.c:794
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Посьпех"
 
-#: src/gtk/gftp-gtk.c:904 src/gtk/misc-gtk.c:922 src/gtk/misc-gtk.c:993
-msgid "Connect"
+#: src/gtk/gftp-gtk.c:1086
+msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:923
-msgid "Error: You must type in a host to connect to\n"
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "Абнавіць"
+
+#: src/gtk/gtkui.c:120
+msgid "Enter Username"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1112
-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";
+#: src/gtk/gtkui.c:121
+#, fuzzy
+msgid "Please enter your username for this site"
+msgstr "Калі ласка, увядзіце Ваш пароль для гэтае пляцоўкі"
+
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
+msgstr "Калі ласка, увядзіце Ваш пароль для гэтае пляцоўкі"
+
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL"
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:75 src/gtk/menu-items.c:105
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
+msgstr "Стварыць тэчку"
+
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
+msgstr "Увядзіце назву будучай тэчкі"
+
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "Перайменаваць"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/menu-items.c:129
-msgid "Connect via URL"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/menu-items.c:129
-msgid "Enter ftp url to connect to"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/menu-items.c:162
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/menu-items.c:199 src/gtk/menu-items.c:202
-msgid "Change Filespec"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:202
-msgid "Enter the new file specification"
+#: 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:520 src/gtk/transfer.c:545
+msgid "Waiting..."
+msgstr "Чаканьне..."
+
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "Перазапісаць"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "Працягнуць"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "Прапусьціць"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "Дзеяньне"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:230 src/gtk/menu-items.c:598 src/gtk/menu-items.c:654
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
 
-#: src/gtk/menu-items.c:256
-msgid "Save Directory Listing"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
 msgstr ""
 
-#: src/gtk/menu-items.c:373
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr "Прапусьціць файл"
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "Вылучыць усе"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr "Зьняць вылучэньне з усіх"
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:392 src/gtk/menu-items.c:395
-msgid "Site"
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
 msgstr ""
 
-#: src/gtk/menu-items.c:395
-msgid "Enter site-specific command"
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
 msgstr ""
 
-#: src/gtk/menu-items.c:494 src/gtk/menu-items.c:528
-msgid "Chdir"
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
 msgstr ""
 
-#: src/gtk/menu-items.c:621 src/gtk/menu-items.c:677
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:687
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:699
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: src/gtk/menu-items.c:735
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: src/gtk/menu-items.c:739 src/gtk/menu-items.c:744
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr ""
 
-#: src/gtk/menu-items.c:775
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Аўтарскія правы © 1998-2002 Brian Masney <masneyb gftp org>\n"
 "Афіцыйная старонка: http://www.gftp.org/\n";
 "Эмблема: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:787
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Пра праграму"
 
-#: src/gtk/menu-items.c:836
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Ліцэнзыйнае пагадненьне"
 
-#: src/gtk/menu-items.c:842 src/gtk/view_dialog.c:377
-msgid "  Close  "
-msgstr "  Зачыніць  "
-
-#: src/gtk/menu-items.c:924
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Параўнаць вокны"
 
-#: src/gtk/misc-gtk.c:212
-msgid "Refresh"
-msgstr "Абнавіць"
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
+msgstr ""
 
-#: src/gtk/misc-gtk.c:301
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Усе файлы"
 
-#: src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:322
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Адлучаны"
 
-#: src/gtk/misc-gtk.c:408
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Памылка адчыненьня фала %s: %s\n"
 
-#: src/gtk/misc-gtk.c:497
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:504
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:512
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:519
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:919 src/gtk/misc-gtk.c:990
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Зьмяніць"
 
-#: src/gtk/misc-gtk.c:925 src/gtk/misc-gtk.c:996 src/gtk/rename_dialog.c:98
-#: src/gtk/rename_dialog.c:110
-msgid "Rename"
-msgstr "Перайменаваць"
-
-#: src/gtk/misc-gtk.c:987 src/gtk/options_dialog.c:1125
-msgid "Add"
-msgstr "Дадаць"
-
-#: src/gtk/misc-gtk.c:1013
-msgid "Cancel"
-msgstr "Адмяніць"
-
-#: src/gtk/misc-gtk.c:1083
-msgid "  Yes  "
-msgstr "  Так  "
-
-#: src/gtk/misc-gtk.c:1093
-msgid "  No  "
-msgstr "  Не  "
-
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Атрыманьне сьпіса файлаў тэчкі"
 
-#: src/gtk/misc-gtk.c:1169
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Спыніць  "
 
-#: src/gtk/misc-gtk.c:1179
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2238,136 +2662,92 @@ msgstr ""
 "Атрымана %ld тэчак\n"
 "і %ld файлаў"
 
-#: src/gtk/mkdir_dialog.c:76
-msgid "Mkdir: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/mkdir_dialog.c:97
-msgid "Mkdir"
-msgstr ""
-
-#: src/gtk/mkdir_dialog.c:101
-msgid "Make Directory"
-msgstr "Стварыць тэчку"
-
-#: src/gtk/mkdir_dialog.c:101
-msgid "Enter name of directory to create"
-msgstr "Увядзіце назву будучай тэчкі"
+#: src/gtk/misc-gtk.c:1079
+#, c-format
+msgid "gFTP Error: Cannot find file %s in %s or %s\n"
+msgstr "Памылка gFTP: немагчыма адшукаць файл %s у %s ці %s\n"
 
-#: src/gtk/options_dialog.c:876
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Рэдагаваць вузел"
 
-#: src/gtk/options_dialog.c:876
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Дадаць вузел"
 
-#: src/gtk/options_dialog.c:908 src/gtk/options_dialog.c:999
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Маёнтак"
 
-#: src/gtk/options_dialog.c:928
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "Сеткавы адрас"
 
-#: src/gtk/options_dialog.c:961 src/gtk/options_dialog.c:1099
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Сеткавая маска"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Маёнтак"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Сеткавая маска"
 
-#: src/gtk/options_dialog.c:1105
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Мясцовыя вузлы"
 
-#: src/gtk/options_dialog.c:1132 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "Рэдагаваць"
-
-#: src/gtk/options_dialog.c:1182 src/gtk/options_dialog.c:1187
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Выбары"
 
-#: src/gtk/rename_dialog.c:77
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/rename_dialog.c:108
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr ""
-
-#: src/gtk/transfer.c:166
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Атрыманьне назваў файлаў..."
 
-#: src/gtk/transfer.c:282
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr ""
-
-#: src/gtk/transfer.c:309 src/gtk/transfer.c:1281
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Далучэньне..."
 
-#: src/gtk/transfer.c:319 src/gtk/transfer.c:1175 src/gtk/transfer.c:1186
-msgid "Enter Password"
-msgstr "Увядізце пароль"
-
-#: src/gtk/transfer.c:320 src/gtk/transfer.c:1176 src/gtk/transfer.c:1187
-msgid "Please enter your password for this site"
-msgstr "Калі ласка, увядзіце Ваш пароль для гэтае пляцоўкі"
-
-#: src/gtk/transfer.c:409
-msgid "Transfer Files"
-msgstr ""
-
-#: src/gtk/transfer.c:417
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/transfer.c:641
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-
-#: src/gtk/transfer.c:698
-#, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Немагчыма выгрузіць %s з %s\n"
-
-#: src/gtk/transfer.c:728
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Пасьпяхова пераданы %s прыблізна з %.2f Кб/с\n"
-
-#: src/gtk/transfer.c:833 src/gtk/transfer.c:1067 src/gtk/transfer.c:1153
-#: src/gtk/transfer.c:1588
-msgid "Skipped"
-msgstr "Прапушчаны"
-
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:1129 src/gtk/transfer.c:1157
-msgid "Waiting..."
-msgstr "Чаканьне..."
-
-#: src/gtk/transfer.c:980
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:983
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Нашчадак %d завяршыўся пасьпяхова\n"
 
-#: src/gtk/transfer.c:990
+#: src/gtk/transfer.c:352
+#, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr ""
+
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Памылка: немагчыма атрымаць зьвесткі пра файлы %s: %s\n"
 
-#: src/gtk/transfer.c:995
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Файл %s ня быў зьменены\n"
 
-#: src/gtk/transfer.c:1003
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2376,144 +2756,155 @@ msgstr ""
 "Файл %s быў зьменены.\n"
 "Жадаеце пагрузіць яго?"
 
-#: src/gtk/transfer.c:1006
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Рэдагаваць файл"
 
-#: src/gtk/transfer.c:1070
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Завершана"
 
-#: src/gtk/transfer.c:1110
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1321
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1346
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1355
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1381
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr ""
-
-#: src/gtk/transfer.c:1460 src/gtk/transfer.c:1482 src/gtk/transfer.c:1516
-#: src/gtk/transfer.c:1556 src/gtk/transfer.c:1609 src/gtk/transfer.c:1668
-msgid "There are no file transfers selected\n"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1500
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1541 src/gtk/transfer.c:1594
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/gtk/transfer.c:1755 src/gtk/transfer.c:1960 src/gtk/transfer.c:1999
-msgid "Overwrite"
-msgstr "Перазапісаць"
-
-#: src/gtk/transfer.c:1777 src/gtk/transfer.c:1970 src/gtk/transfer.c:2005
-msgid "Resume"
-msgstr "Працягнуць"
-
-#: src/gtk/transfer.c:1799 src/gtk/transfer.c:1965
-msgid "Skip"
-msgstr "Прапусьціць"
-
-#: src/gtk/transfer.c:1876
-msgid "Local Size"
-msgstr "Мясцовы памер"
-
-#: src/gtk/transfer.c:1877
-msgid "Remote Size"
-msgstr "Аддалены памер"
-
-#: src/gtk/transfer.c:1878
-msgid "Action"
-msgstr "Дзеяньне"
-
-#: src/gtk/transfer.c:1880
-msgid "Download Files"
-msgstr "Выгрузіць файлы"
-
-#: src/gtk/transfer.c:1880
-msgid "Upload Files"
-msgstr "Пагрузіць файлы"
-
-#: src/gtk/transfer.c:1906
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
+#: 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 ""
 
-#: src/gtk/transfer.c:2011
-msgid "Skip File"
-msgstr "Прапусьціць файл"
-
-#: src/gtk/transfer.c:2021
-msgid "Select All"
-msgstr "Вылучыць усе"
-
-#: src/gtk/transfer.c:2027
-msgid "Deselect All"
-msgstr "Зьняць вылучэньне з усіх"
-
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr ""
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Рэдагаваць"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Адчыняецца %s з дапамогай %s\n"
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Прагляд файла %s\n"
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Прагляд: немагчыма адчыніць файл %s: %s\n"
 
+#: src/text/gftp-text.c:166
+#, fuzzy, c-format
+msgid "Cannot open controlling terminal %s\n"
+msgstr "Памылка gFTP: немагчыма адчыінць файл наладак %s: %s\n"
+
+#: src/text/textui.c:80
+msgid "Username [anonymous]:"
+msgstr ""
+
+#: src/text/textui.c:158
+#, c-format
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+msgstr ""
+
+#~ msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "выкарыстаньне: gftp [[пратакол://][карыстальнік[:пароль] ]вузел[:порт][/"
+#~ "тэчка]]\n"
+
+#~ msgid "WARNING"
+#~ msgstr "УВАГА"
+
+#~ msgid "Could not download %s\n"
+#~ msgstr "Немагчыма выгрузіць %s\n"
+
+#~ msgid "Successfully transferred %s\n"
+#~ msgstr "Пасьпяхова пераданы %s\n"
+
+#~ msgid "  Close  "
+#~ msgstr "  Зачыніць  "
+
+#~ msgid "Add"
+#~ msgstr "Дадаць"
+
+#~ msgid "Cancel"
+#~ msgstr "Адмяніць"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Так  "
+
+#~ msgid "  No  "
+#~ msgstr "  Не  "
+
+#~ msgid "Local Size"
+#~ msgstr "Мясцовы памер"
+
+#~ msgid "Remote Size"
+#~ msgstr "Аддалены памер"
+
+#~ msgid "Download Files"
+#~ msgstr "Выгрузіць файлы"
+
+#~ msgid "Upload Files"
+#~ msgstr "Пагрузіць файлы"
diff --git a/po/bg.po b/po/bg.po
index 78b852c..a346d65 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,91 +11,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-10 18:23+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2005-08-09 10:36+0300\n"
 "Last-Translator: Alexander Shopov <ash contact bg>\n"
 "Language-Team: Bulgarian GNOME translation team <dict fsa-bg org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Невалидно URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Грешка: Невалиден ред %s в индексният файл на временната памет\n"
 
-#: ../lib/cache.c:137 ../lib/fsp.c:537 ../lib/local.c:477
+#: 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"
 
-#: ../lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Грешка: Не може да се създаде временен файл: %s\n"
 
-#: ../lib/cache.c:183 ../lib/cache.c:232 ../lib/config_file.c:157
-#: ../lib/config_file.c:163 ../lib/local.c:102 ../lib/local.c:217
-#: ../lib/rfc2068.c:259 ../lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Грешка при затваряне на файловият описател: %s\n"
 
-#: ../lib/cache.c:250 ../lib/fsp.c:128 ../lib/fsp.c:208 ../lib/local.c:136
-#: ../lib/local.c:145 ../lib/local.c:192
+#: 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 "Грешка: Не може да се извърши „seek“ на файла %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3000
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Грешка при преобразуването на низа „%s“ от кодиране %s към кодиране %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Грешка: Не може да се отвори локален файл %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2707 ../lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Грешка: Не може да се пише в гнездо: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2631 ../lib/sshv2.c:364
-#: ../lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Грешка: Не може да се чете от гнездо: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Предупреждение: Не може да се намери главния файл с отметки %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Предупреждение на gFTP: Прескачане на %d ред във файла с отметки: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 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 "
@@ -105,7 +112,7 @@ msgstr ""
 "да се използва прокси сървър (ако е наличен). Синтаксис: "
 "dont_use_proxy=домейн или dont_use_proxy=мрежа/маска"
 
-#: ../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"
@@ -114,65 +121,66 @@ msgstr ""
 "преглед. Забележка: Всички аргументи с изключение на разширението на файла "
 "са незадължителни."
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Пуснахте ли make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Грешка на gFTP: Невалидно име на журналния файл %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
 "org>. Предупреждение: Всички коментари, които добавите към този файл ще "
 "бъдат изтрити при презапис."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -184,9 +192,10 @@ msgstr ""
 "запомнена от някой стоящ зад вас, докато вие редактирате този файл. Преди "
 "всички пароли бяха записвани в прав текст."
 
-#: ../lib/config_file.c:845
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -195,94 +204,95 @@ msgstr ""
 "ЩЕ бъдат препокрити. Ако записа има (*) в коментара не може да го смените от "
 "gFTP."
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:383 ../lib/protocols.c:455
-#: ../lib/protocols.c:526 ../lib/rfc2068.c:545 ../lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<неизвестен>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:190
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Грешка: Файлът %s не може да бъде качен\n"
 
-#: ../lib/fsp.c:200
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Грешка: Не може да се записва във файла %s: %s\n"
 
-#: ../lib/fsp.c:238
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Грешка: Грешка при затваряне на файл: %s\n"
 
-#: ../lib/fsp.c:326
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Развалено изписване на файлове от FSP сървър %s\n"
 
-#: ../lib/fsp.c:338 ../lib/fsp.c:339 ../lib/protocols.c:1541
-#: ../lib/protocols.c:1542 ../lib/protocols.c:1583 ../lib/protocols.c:1584
-#: ../lib/protocols.c:1647 ../lib/protocols.c:1654 ../lib/protocols.c:1730
-#: ../lib/protocols.c:1731 ../lib/protocols.c:1767
+#: 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 "неизвестен"
 
-#: ../lib/fsp.c:376
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Неуспех при получаването на FSP списъка с папки %s: %s\n"
 
-#: ../lib/fsp.c:438
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Успешно отваряне на папката %s\n"
 
-#: ../lib/fsp.c:448
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Неуспех при отварянето на папката %s\n"
 
-#: ../lib/fsp.c:473 ../lib/fsp.c:502 ../lib/local.c:424 ../lib/local.c:447
-#: ../src/gtk/transfer.c:260 ../src/gtk/view_dialog.c:328
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s беше успешно премахнато.\n"
 
-#: ../lib/fsp.c:479 ../lib/local.c:430
+#: 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:508 ../lib/local.c:453 ../src/gtk/transfer.c:264
-#: ../src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Грешка: Не може да се премахне файла %s: %s\n"
 
-#: ../lib/fsp.c:530 ../lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Папката %s беше успешно създадена\n"
 
-#: ../lib/fsp.c:565 ../lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s беше успешно преименуван на %s\n"
 
-#: ../lib/fsp.c:577 ../lib/local.c:503
+#: 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"
@@ -290,7 +300,7 @@ msgstr ""
 "FTPS поддръжката не е налична, тъй като няма компилирана SSL поддръжка. "
 "Връзката ще бъде прекъсната...\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -298,100 +308,105 @@ msgstr ""
 "HTTPS поддръжката не е налична, тъй като няма компилирана SSL поддръжка. "
 "Връзката ще бъде прекъсната...\n"
 
-#: ../lib/local.c:71 ../lib/local.c:407
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Не може да се смени отвори локалната папка %s: %s\n"
-
-#: ../lib/local.c:85 ../lib/local.c:392
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Не може да се получи текущата работна папка: %s\n"
 
-#: ../lib/local.c:183
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Успешно отваряне на локалната папка %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Не може да се смени отвори локалната папка %s: %s\n"
+
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Грешка: Не може да се отреже локалния файл %s: %s\n"
 
-#: ../lib/local.c:347
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Не може да се получи списъка с локалните папки %s: %s\n"
 
-#: ../lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Успешно отваряне на локалната папка %s\n"
-
-#: ../lib/local.c:520
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Режимът %s беше успешно сменен на %o\n"
 
-#: ../lib/local.c:527
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Грешка: Неуспех при промяната на режима %s към %o: %s\n"
 
-#: ../lib/local.c:623
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Успешно отваряне на папката %s\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Грешка: Неуспех при промяната на режима %s към %o: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "локална файлова система"
 
-#: ../lib/misc.c:401
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "употреба: gftp "
 
-#: ../lib/misc.c:401 ../lib/rfc2068.c:303 ../src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../lib/options.h:24 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "няма"
 
-#: ../lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "файл"
 
-#: ../lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "размер"
 
-#: ../lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "потребител"
 
-#: ../lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "група"
 
-#: ../lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "дата и време"
 
-#: ../lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "атрибути"
 
-#: ../lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "в низходящ ред"
 
-#: ../lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "във възходящ ред"
 
-#: ../lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Основни"
 
-#: ../lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Програма за преглед:"
 
-#: ../lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -399,35 +414,27 @@ msgstr ""
 "Подразбиращата се програма използвана за преглед на файлове. Ако това поле е "
 "празно ще се използва вградената."
 
-#: ../lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Програма за редактиране:"
 
-#: ../lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Подразбиращата се програма за редактиране на файлове."
 
-#: ../lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Начална папка:"
-
-#: ../lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Подразбиращата се папка на gFTP при стартиране"
-
-#: ../lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Максималният размер на журналния прозорец:"
 
-#: ../lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Максималният размер на журналния прозорец в байта за GTK+ port"
 
-#: ../lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Кодирането на отдалечения сървър е:"
 
-#: ../lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -435,11 +442,11 @@ msgstr ""
 "Това е списък със символи, разделен със запетаи, за да се преведат "
 "отдалечените съобщения за текущата локала."
 
-#: ../lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME на отдалечения сървър е:"
 
-#: ../lib/options.h:55
+#: lib/options.h:58
 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."
@@ -447,177 +454,200 @@ msgstr ""
 "Това е стойността на LC_TIME за отдалечения сървър. Тя се използва, за да "
 "може датите в показваните папки да се анализират правилно"
 
-#: ../lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Продължителност на временната памет:"
 
-#: ../lib/options.h:60
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Колко секунди да се пазят записите във временната памет"
 
-#: ../lib/options.h:63
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Добавяне на файл за прехвърляне"
 
-#: ../lib/options.h:65
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Добавяне на нов файл за прехвърляне към опашката"
 
-#: ../lib/options.h:66
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Извършване само на едно прехвърляне наведнъж"
 
-#: ../lib/options.h:68
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Да се прави само по едно прехвърляне наведнъж?"
 
-#: ../lib/options.h:69
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Презаписване по подразбиране"
 
-#: ../lib/options.h:72
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Да се презаписват файловете по подразбиране или да бъдат продължени, от "
 "където са прекъснати."
 
-#: ../lib/options.h:74
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Запазване на файловите права"
 
-#: ../lib/options.h:77
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Запазване на файловите права на прехвърлените файлове"
 
-#: ../lib/options.h:79
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Запазване времето на файловете"
 
-#: ../lib/options.h:82
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Запазване на времената на прехвърлените файлове"
 
-#: ../lib/options.h:84
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Обновяване след всеки прехвърлен файл"
 
-#: ../lib/options.h:87
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Обновяване на списъка след всеки прехвърлен файл"
 
-#: ../lib/options.h:89
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Подреждане на папките в началото на списъка"
 
-#: ../lib/options.h:92
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Поставяне на папките първи в списъка и след това файловете"
 
-#: ../lib/options.h:93
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Показване на скритите файлове"
 
-#: ../lib/options.h:96
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Показване на скритите файлове в списъка"
 
-#: ../lib/options.h:97
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Показване на състоянието на преноса в заглавието"
 
-#: ../lib/options.h:99
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr ""
 "Показване на състоянието на преноса на файлове в лентата за заглавието на "
 "прозореца"
 
-#: ../lib/options.h:100
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Започване на прехвърляне на файл"
 
-#: ../lib/options.h:102
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Автоматично започване на прехвърлянето на файл, когато е на изчакване"
 
-#: ../lib/options.h:104
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Позволяване на потребителски команди в графичния интерфейс"
 
-#: ../lib/options.h:106
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Позволява въвеждането на ръчни команди в графичния интерфейс (функционира "
 "като текстовата версия на програмата)"
 
-#: ../lib/options.h:108 ../src/gtk/options_dialog.c:1023
-#: ../src/gtk/options_dialog.c:1243
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Премахване на локална папка"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Прекъсване на връзката с отдалечения сървър"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../lib/options.h:110
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Забавяне на мрежата:"
 
-#: ../lib/options.h:113
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Време на изчакване за мрежов вход/изход. Това НЕ Е време на изчакване при "
 "бездействие."
 
-#: ../lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Повторни свързвания:"
 
-#: ../lib/options.h:118
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Брой автоматични повторения за свързване. Ако зададете 0, повторните опити "
 "ще бъдат неограничени."
 
-#: ../lib/options.h:120
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Време за изчакване между опитите:"
 
-#: ../lib/options.h:123
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Брой секунди за изчакване между опитите"
 
-#: ../lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Макс. Кб/с:"
 
-#: ../lib/options.h:127
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Максимума Кб/с пренос, с който един файл може да бъде прехвърлян. (Задайте 0 "
 "за изключване на ограничението)"
 
-#: ../lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Размер на блоковете за пренос:"
 
-#: ../lib/options.h:132
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Размерът на блоковете при пренос на файловете. Трябва да е кратен на 1024."
 
-#: ../lib/options.h:135
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Стандартен протокол:"
 
-#: ../lib/options.h:137
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Това определя стандартния протокол"
 
-#: ../lib/options.h:139 ../lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Включване на поддръжка на IPv6"
 
-#: ../lib/options.h:147
+#: lib/options.h:159
 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"
@@ -625,28 +655,28 @@ msgstr ""
 "Това определя какво ще се случи, когато натиснете два пъти върху файл от "
 "списъка. 0=Преглеждане на файл 1=Редактиране на файл 2=Прехвърляне на файл"
 
-#: ../lib/options.h:150
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Подразбиращата се ширина на списъка с локални файлове"
 
-#: ../lib/options.h:153
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Подразбиращата се ширина на списъка с отдалечени файлове"
 
-#: ../lib/options.h:156
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 "Подразбиращата се височина на списъците с локалните и отдалечените файлове"
 
-#: ../lib/options.h:159
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Подразбиращата се височина на списъка с файлове за трансфер"
 
-#: ../lib/options.h:162
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Подразбиращата се височина на журналния прозорец"
 
-#: ../lib/options.h:165
+#: 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."
@@ -654,15 +684,15 @@ msgstr ""
 "Ширината на колоната с имената на файловете в прозореца за пренос на данни. "
 "Задайте 0, ако искате автоматична промяна на размера."
 
-#: ../lib/options.h:173 ../lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "По коя колона да се сортира по подразбиране"
 
-#: ../lib/options.h:176 ../lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Сортиране в низходящ или възходящ ред"
 
-#: ../lib/options.h:186 ../lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -671,7 +701,7 @@ msgstr ""
 "автоматична промяна на размера. Задайте -1, ако искате да забраните тази "
 "колона"
 
-#: ../lib/options.h:189 ../lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -680,7 +710,7 @@ msgstr ""
 "автоматична промяна на размера. Задайте -1, ако искате да забраните тази "
 "колона"
 
-#: ../lib/options.h:192 ../lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -689,7 +719,7 @@ msgstr ""
 "искате автоматична промяна на размера. Задайте -1, ако искате да забраните "
 "тази колона"
 
-#: ../lib/options.h:195 ../lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -698,7 +728,7 @@ msgstr ""
 "искате автоматична промяна на размера. Задайте -1, ако искате да забраните "
 "тази колона."
 
-#: ../lib/options.h:198 ../lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -707,7 +737,7 @@ msgstr ""
 "автоматична промяна на размера. Задайте -1, ако искате да забраните тази "
 "колона"
 
-#: ../lib/options.h:201 ../lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -716,97 +746,75 @@ msgstr ""
 "автоматична промяна на размера. Задайте -1, ако искате да забраните тази "
 "колона"
 
-#: ../lib/options.h:222
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Цветът на командите, които се изпращат на сървъра"
 
-#: ../lib/options.h:225
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Цветът на командите, които се получават от сървъра"
 
-#: ../lib/options.h:228
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Цветът на съобщенията за грешка"
 
-#: ../lib/options.h:231
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Цветът на останалите журнални съобщения"
 
-#: ../lib/options.h:237 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:240 ../lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:245 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:248 ../lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr "Локален"
 
-#: ../lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:257 ../src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Отметка"
 
-#: ../lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Прехвърлянето на файлове ще бъде ограничено до %.2f КБ/с\n"
 
-#: ../lib/protocols.c:379
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Грешка при задаването на LC_TIME да е „%s“. Ще се ползва „%s“\n"
 
-#: ../lib/protocols.c:390
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Зарежда се списъка с папките %s от временната памет (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:400
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Зарежда се списъка с папките %s от временната памет (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:454 ../lib/protocols.c:486 ../lib/protocols.c:525
-#: ../lib/protocols.c:557
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Грешка при преобразуването на низа „%s“ от кодиране %s към кодиране %s: %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:469
-#, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
-msgstr "Грешка при преобразуване на низа „%s“ от текущия локал към UTF-8: %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:540
-#, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr "Грешка при преобразуване на низа „%s“ от UTF-8 към текущия локал: %s\n"
-
-#: ../lib/protocols.c:629
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -815,167 +823,113 @@ msgstr ""
 "Предупреждение: Началната част от името на файла „%s“ се изрязва. Изрязаният "
 "низ (%s) не съвпада с текущата папка (%s)\n"
 
-#: ../lib/protocols.c:647
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Грешка: Не може да се пише във временната памет: %s\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Грешка: Не може да се намери отметката %s\n"
 
-#: ../lib/protocols.c:687
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Грешка при отметките: Отметката %s няма име на хост\n"
 
-#: ../lib/protocols.c:826 ../lib/protocols.c:853
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Протоколът „%s“ за сега не е поддържан.\n"
 
-#: ../lib/protocols.c:1167 ../lib/protocols.c:1182 ../lib/protocols.c:2214
-#: ../lib/protocols.c:2324
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Търси се %s\n"
-
-#: ../lib/protocols.c:1173 ../lib/protocols.c:1188 ../lib/protocols.c:2219
-#: ../lib/protocols.c:2329
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Не може да се открие името на хоста %s: %s\n"
-
-#: ../lib/protocols.c:2237
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Неуспех при създаване на socket: %s\n"
-
-#: ../lib/protocols.c:2243 ../lib/protocols.c:2346
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Опитва се с %s:%d\n"
-
-#: ../lib/protocols.c:2248 ../lib/protocols.c:2353
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Не може да се осъществи връзка с %s: %s\n"
-
-#: ../lib/protocols.c:2283 ../lib/rfc959.c:640
+#: lib/protocols.c:1153
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Неуспех при създаване на IPv4 socket: %s\n"
-
-#: ../lib/protocols.c:2307 ../lib/sshv2.c:1046
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-"Не може да бъде прочетена информация за услугата %s/tcp. Проверете Вашият "
-"файл за услугите (напр. /etc/services/)\n"
-
-#: ../lib/protocols.c:2369 ../lib/protocols.c:3009 ../lib/rfc959.c:649
-#: ../lib/rfc959.c:826
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
-"Грешка: Не може да се зададе на флаг за затваряне след изпълнение: %s\n"
 
-#: ../lib/protocols.c:2376
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Връзката с %s е осъществена:%d\n"
-
-#: ../lib/protocols.c:2607 ../lib/protocols.c:2682 ../lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Връзката към %s прекъсна, заради дълго време бездействие\n"
-
-#: ../lib/protocols.c:2750
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Флаговете за гнездото не могат да бъдат получени: %s\n"
-
-#: ../lib/protocols.c:2764
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Не може да бъде зададен режим без блокиране на гнездото: %s\n"
-
-#: ../lib/protocols.c:2899
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Грешка: Отдалечената страна %s прекъсна връзката. Достигнат е максималния "
 "брой опити и няма да се пробва отново.\n"
 
-#: ../lib/protocols.c:2907
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Грешка: Отдалечената страна %s прекъсна връзката. Ще има нов опит за връзка "
 "отново след %d секунди\n"
 
-#: ../lib/pty.c:297
+#: lib/protocols.c:1634 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 ""
+"Грешка: Не може да се зададе на флаг за затваряне след изпълнение: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Не може да се отвори главния псевдотерминал %s: %s\n"
 
-#: ../lib/pty.c:305
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Не може да се създаде двойка гнезда: %s\n"
 
-#: ../lib/pty.c:334
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Грешка: Не може да се изпълни ssh: %s\n"
 
-#: ../lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Не може да се направи fork за друг процес: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Хост на сървъра посредник:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Хост на защитна стена"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Порт на сървъра посредник:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Порт за връзка със защитна стена"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Потребител за сървъра посредник:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Вашият потребител за защитна стена"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Парола за сървъра посредник:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Вашата парола за защитна стена"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Използване HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Искате да използвате HTTP/1.1 или HTTP/1.0?"
 
-#: ../lib/rfc2068.c:150 ../lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -984,65 +938,65 @@ msgstr ""
 "Получен е грешен отговор от сървъра. Връзката се прекъсна.\n"
 "Сървърът върна невалиден размер на пакет „%s“\n"
 
-#: ../lib/rfc2068.c:254 ../lib/rfc959.c:608 ../lib/sshv2.c:1123
+#: 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:303
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Започване на пренос на файл с отместване "
 
-#: ../lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Не може да се получи файла %s\n"
 
-#: ../lib/rfc2068.c:423 ../lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Получава се списък с папките...\n"
 
-#: ../lib/rfc2068.c:819 ../lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Получен е грешен отговор от сървър, прекъсва се връзката\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE команда"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "потребител хост"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "потребител хост:порт"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "ИДЕНТИФИКАЦИЯ"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "потребител хост порт"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "потребител хост NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP сървър посредник"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Потребителски"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Адрес на ел. поща:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1050,19 +1004,19 @@ msgstr ""
 "Това е паролата, която ще бъде използвана, когато ще се свързвате с "
 "отдалечени FTP сървъри анонимно."
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Абонамент за сървър посредник:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Вашият абонамент за защитна стена (незадължителен)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Вид сървър посредник:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1080,11 +1034,11 @@ msgstr ""
 "„a“ (абонамент). Например, за да укажете потребителя за сървъра посредник, "
 "използвайте „%pu“"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Игнориране на адресите за пасивна връзка"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1096,11 +1050,11 @@ msgstr ""
 "често се налага за маршрутизатори, които подават вътрешния си, а не външния "
 "си IP адрес при отговор за пасивна връзка."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Пасивен трансфер на файлове"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1116,11 +1070,11 @@ msgstr ""
 "gFTP ще отвори порт от страната на клиента и отдалечения сървър ще се опита "
 "да се свърже към него."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Проследяване на отдалечените символни връзки (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1132,15 +1086,16 @@ msgstr ""
 "който може да Ви се наложи да я изключите, е ако сървърът за FTP не поддържа "
 "опцията „-L“ на командата „LIST“"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Прехвърляне на файлове в ASCII режим"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1150,271 +1105,324 @@ msgstr ""
 "оставите тази опция изключена. Ако прехвърляте бинарна(двоична) информация, "
 "ще трябва да изключите това."
 
-#: ../lib/rfc959.c:322 ../lib/rfc959.c:331 ../lib/rfc959.c:342
-#: ../lib/rfc959.c:789 ../lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Невалиден отговор „%c“ получен от сървъра.\n"
 
-#: ../lib/rfc959.c:679 ../lib/rfc959.c:689
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Неуспех при създаване на IPv4 socket: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Не може да се открие IP адреса в PASV отговор „%s“\n"
 
-#: ../lib/rfc959.c:715
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Игнорира се адреса IP в отговора PASV, свързване към %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:726 ../lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Не може да се създаде връзка за данни: %s\n"
 
-#: ../lib/rfc959.c:738 ../lib/rfc959.c:759 ../lib/rfc959.c:912
+#: 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:749 ../lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Не може да се върже порт: %s\n"
 
-#: ../lib/rfc959.c:768 ../lib/rfc959.c:921
+#: 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:817
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Неуспех при създаване на гнездо за IPv6: %s\n"
 
-#: ../lib/rfc959.c:837
+#: 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:865 ../lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Невалиден EPSV отговор „%s“\n"
 
-#: ../lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Адресът на локално гнездо не може да бъде получен: %s\n"
 
-#: ../lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Не може да се приеме връзка от сървър: %s\n"
 
-#: ../lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "общо"
 
-#: ../lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "ВНИМАНИЕ: Не може да се обработи списъка %s\n"
 
-#: ../lib/sshv2.c:28
+#: 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 "Неуспех при създаване на socket: %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. Проверете Вашият "
+"файл за услугите (напр. /etc/services/)\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
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Име на програма:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Път към SSH програмата"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Допълнителни параметри на SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Допълнителни параметри за подаване към SSH програма"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Необходимост от SSH Потребител/Парола"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Изисква се име/парола за SSH връзки"
 
-#: ../lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Изпълняване на програмата %s\n"
 
-#: ../lib/sshv2.c:307
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Въведете паролата за ключа на RSA"
 
-#: ../lib/sshv2.c:308
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Въведете парола за ключа „"
 
-#: ../lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Парола"
 
-#: ../lib/sshv2.c:310
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "парола"
 
-#: ../lib/sshv2.c:414
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(да/не)?"
 
-#: ../lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Въвеждане на ПАРОЛА:"
 
-#: ../lib/sshv2.c:436 ../src/gtk/gtkui.c:118 ../src/gtk/transfer.c:554
-#: ../src/gtk/transfer.c:564
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Въвеждане на парола"
 
-#: ../lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Въвеждане на SecurID парола:"
 
-#: ../lib/sshv2.c:487
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Грешка: Въвели сте неправилна парола\n"
 
-#: ../lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Инициализация на протокола\n"
 
-#: ../lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Версия на протокола %d\n"
 
-#: ../lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Отваряне на %s\n"
 
-#: ../lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Затваряне\n"
 
-#: ../lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Отваряне на папка %s\n"
 
-#: ../lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Четене на папка\n"
 
-#: ../lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Премахване на файл %s\n"
 
-#: ../lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Създаване на папка %s\n"
 
-#: ../lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Премахване на папка %s\n"
 
-#: ../lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Истински път %s\n"
 
-#: ../lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Атрибути на файл\n"
 
-#: ../lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Статистика %s\n"
 
-#: ../lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:609 ../src/gtk/bookmarks.c:1045 ../src/gtk/bookmarks.c:1298
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:368
-#: ../src/gtk/misc-gtk.c:1011 ../src/gtk/options_dialog.c:1208
-#: ../src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:615
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Няма такъв файл или папка"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Отхвърлени права"
 
-#: ../lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Неуспешно"
 
-#: ../lib/sshv2.c:624
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Лошо съобщение"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Няма връзка"
 
-#: ../lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Връзката беше загубена"
 
-#: ../lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Неподдържана операция"
 
-#: ../lib/sshv2.c:636
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "От сървъра е върнато непознато съобщение"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Грешка: Размера на съобщението %d е твърде голям\n"
 
-#: ../lib/sshv2.c:730 ../lib/sshv2.c:1225 ../lib/sshv2.c:1821
-#: ../lib/sshv2.c:1959
+#: 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"
 
-#: ../lib/sshv2.c:736
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1422,41 +1430,41 @@ msgstr ""
 "Имаше грешка при установяването на SSL връзка с отдалечения сървър. Следното "
 "съобщение за грешка бе получено от отдалечения сървър:\n"
 
-#: ../lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Отваря се SSH връзка към %s\n"
 
-#: ../lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Успешно влизане в SSH сървъра %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL Двигател"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Файл за ентропия за SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Файл за ентропия за SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Дължината на захранването за ентропия:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Максималният брой байтове, с които да се захрани подсистемата за SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Проверка на отсрещната машина по SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1469,11 +1477,11 @@ msgstr ""
 "Относно = %s\n"
 "Грешка %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Сертификатът на отсрещната машина не може да бъде получен\n"
 
-#: ../lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1482,55 +1490,45 @@ msgstr ""
 "ГРЕШКА: Машината упомената в сертификата за SSL (%s) не е машината, към "
 "която е връзката (%s). Връзката се преустановява.\n"
 
-#: ../lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Библиотеката за OpenSSL не може да бъде инициализирана\n"
 
-#: ../lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Грешка при зареждането на сертификатите за SSL по подразбиране\n"
 
-#: ../lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Грешка при задаване на списъка с шифри (липсват валидни шифри)\n"
 
-#: ../lib/sslcommon.c:342 ../lib/sslcommon.c:416 ../lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Грешка: Ядрото за SSL не е инициализирано\n"
 
-#: ../lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Грешка при установяване на връзка по SSL (в обект BIO)\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Грешка при установяване на връзка по SSL (в обект SSL)\n"
 
-#: ../lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Грешка в сертификата на отсрещната машина: %s\n"
 
-#: ../src/uicommon/gftpui.c:91
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Изчаква се %d секунди преди нов опит за свързване\n"
-
-#: ../src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Операцията е прекъсната\n"
 
-#: ../src/uicommon/gftpui.c:190
-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 ""
-">. Ако имате някакви въпроси, коментари или предложения за тази програма ни "
-"пишете. Можете винаги да намерите последните новини за gFTP от http://www.";
-"gftp.org/\n"
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Изчаква се %d секунди преди нов опит за свързване\n"
 
-#: ../src/uicommon/gftpui.c:191
+#: 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 "
@@ -1539,7 +1537,7 @@ msgstr ""
 "gFTP е БЕЗ ВСЯКАКВИ ГАРАНЦИИ; Това е свободен софтуер и вие може да го "
 "разпространявате при известни условия, вижте файла COPYING за подробности\n"
 
-#: ../src/uicommon/gftpui.c:193 ../src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Борислав Александров <B Aleksandrov cnsys bg>\n"
@@ -1550,69 +1548,69 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n";
 "Докладвайте за грешки на http://gnome.cult.bg/bugs";
 
-#: ../src/uicommon/gftpui.c:240 ../src/uicommon/gftpui.c:282
-#: ../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:872
+#: 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:251
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "употреба: chmod <вид> <файл>\n"
 
-#: ../src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "употреба: rename <старо име> <ново име>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "употреба: delete <файл>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "употреба: rmdir <папка>\n"
 
-#: ../src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "употреба: site <сайт команда>\n"
 
-#: ../src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "употреба: mkdir <нова папка>\n"
 
-#: ../src/uicommon/gftpui.c:469 ../src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "употреба: chdir <папка>\n"
 
-#: ../src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Невалиден аргумент\n"
 
-#: ../src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Изчиства временната памет за папката\n"
 
-#: ../src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "употреба: open "
 
-#: ../src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "употреба: set [променлива=стойност]\n"
 
-#: ../src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Грешка: Променливата %s не е валидна конфигурационна променлива.\n"
 
-#: ../src/uicommon/gftpui.c:754
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Грешка: Променливата %s не е валидна конфигурационна променлива.\n"
 
-#: ../src/uicommon/gftpui.c:836
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1620,318 +1618,323 @@ msgstr ""
 "Поддържани команди:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "употреба: %s <файлова спецификация>\n"
 
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Показване на информация за gFTP"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ASCII"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Използване на Ascii режим за текущия трансфер (само за FTP)"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Използване на бинарен(двоичен) режим за текущия трансфер (само за FTP)"
 
-#: ../src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:971 ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Променяне на отдалечената работна папка"
 
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Променяне на правата на отдалечен файл"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Налични опции: cache"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Прекъсване на връзката с отдалечения сайт"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Премахване на отдалечен файл"
 
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:983 ../src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Показване на списъка с файловете на текущата отдалечена папка"
 
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:985 ../src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Изтегляне на отдалечен(и) файл(ове)"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Показване на този помощен екран"
 
-#: ../src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:989 ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Промяна на локалната работна папка"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Промяна на правата на локален файл"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Премахване на локален файл"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:997 ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Показване на списъка с файловете на текущата локална папка"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Създаване на локална папка"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Показване на текуща локална папка"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Преименуване на локален файл"
 
-#: ../src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Премахване на локална папка"
 
-#: ../src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Създаване на отдалечена папка"
 
-#: ../src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:1015 ../src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Прехвърляне на локален/ни файл(ове)"
 
-#: ../src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Отваряне на връзка към отдалечен сайт"
 
-#: ../src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Показване на текуща отдалечена папка"
 
-#: ../src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Спиране на gFTP"
 
-#: ../src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Преименуване на отдалечен файл"
 
-#: ../src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Премахване на отдалечена папка"
 
-#: ../src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Показване на променливите от конфигурационния файл. Също така можете да "
 "настройвате променливи със set променлива=стойност"
 
-#: ../src/uicommon/gftpui.c:1031
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Изпълняване на специфична за сайта команда"
 
-#: ../src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Грешка: Непозната команда\n"
 
-#: ../src/uicommon/gftpui.c:1375
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-"Грешка: Отдалеченият сайт прекъсна връзката след опит за прехвърляне на "
-"файл\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Успешно прехвърлени %s с %.2f КБ/с\n"
 
-#: ../src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Не може да се изтегли %s от %s\n"
+msgid "Skipping file %s on host %s\n"
+msgstr "Прескача файла %s от хост %s\n"
 
-#: ../src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Успешно прехвърлени %s с %.2f КБ/с\n"
+msgid "Stopping the transfer on host %s\n"
+msgstr "Спиране на преноса от хост %s\n"
 
-#: ../src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1505
 #, c-format
-msgid "There was an error transfering the file %s"
-msgstr "Появи се грешка при преноса на файла %s"
+msgid "Could not download %s from %s\n"
+msgstr "Не може да се изтегли %s от %s\n"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:213
-#: ../src/gtk/gftp-gtk.c:1063 ../src/gtk/misc-gtk.c:512
-#: ../src/gtk/misc-gtk.c:520
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Първо натиснете бутона за спиране, за да извършите нещо друго.\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Стартиране на отметка"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Добавяне на отметка: Вие трябва да въведете име на отметката\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Добавяне на отметка: Не може да се добави отметката %s, защото това име вече "
 "съществува\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Добавяне на отметка"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Добавяне на отметка: Трябва да зададете име на хост\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1941,135 +1944,139 @@ msgstr ""
 "Може да разделяте отметки с / за да ги поставяте в подменюта (пример: Linux "
 "Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Запомняне на паролата"
 
-#: ../src/gtk/bookmarks.c:473 ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Добавяне на отметка: Вие трябва да въведете име на отметката\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Нова папка"
 
-#: ../src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Въведете името на новата папка за създаване"
 
-#: ../src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Файл/Нов обект..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Въведете името на новия обект за създаване"
 
-#: ../src/gtk/bookmarks.c:557
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Сигурен ли сте, че желаете да изтриете отметката\n"
 "%s и всички нейни елементи?"
 
-#: ../src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Изтриване на отметка"
 
-#: ../src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: ../src/gtk/bookmarks.c:850 ../src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Редактиране на запис"
 
-#: ../src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Хост:"
 
-#: ../src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Отдалечена папка:"
 
-#: ../src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Локална папка:"
 
-#: ../src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Потребителско име:"
 
-#: ../src/gtk/bookmarks.c:1003 ../src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Абонамент:"
 
-#: ../src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Влизане с ANONYMOUS(като анонимен)"
 
-#: ../src/gtk/bookmarks.c:1056 ../src/gtk/bookmarks.c:1309
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:380
-#: ../src/gtk/options_dialog.c:1219 ../src/gtk/options_dialog.c:1453
-msgid "  Cancel  "
-msgstr "  Отказване  "
-
-#: ../src/gtk/bookmarks.c:1065 ../src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Прилагане"
-
-#: ../src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Файл/tearoff"
 
-#: ../src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Файл/Нова папка..."
 
-#: ../src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Файл/Нов обект..."
 
-#: ../src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Файл/Изтриване"
 
-#: ../src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Файл/Настройки..."
 
-#: ../src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Файл/sep"
 
-#: ../src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Файл/Затваряне"
 
-#: ../src/gtk/bookmarks.c:1240 ../src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Редактиране на отметки"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2077,91 +2084,90 @@ msgstr ""
 "Може да нагласите атрибутите на вашите файлове\n"
 "Забележка: Не всички ftp сървъри позволяват това"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Специален"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Потребител"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Четене"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Запис"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Изпълнение"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Група"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Други"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Сигурни ли сте, че искате да изтриете тези %ld файлове и %ld папки"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Сигурни ли сте, че искате да изтриете тези %ld файлове"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Сигурни ли сте, че искате да изтриете тези %ld папки"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Изтриване на файлове/папки"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Изтриване"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1064 ../src/gtk/misc-gtk.c:946
-#: ../src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Свързване"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Получено URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Изтегляне и пускане"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Спиране на програмата"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2169,472 +2175,508 @@ msgstr ""
 "В момента протича прехвърляне на файлове.\n"
 "Сигурен ли сте, че искате да излезете от програмата?"
 
-#: ../src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr "Връзка през URL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Настройки"
 
-#: ../src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Въведете URL за връзка"
 
-#: ../src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "OpenURL"
-
-#: ../src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Прозорец 1"
 
-#: ../src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Прозорец 2"
 
-#: ../src/gtk/gftp-gtk.c:250 ../src/gtk/gftp-gtk.c:255
-#: ../src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: ../src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Двоично"
 
-#: ../src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Настройки..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Файл/Настройки..."
 
-#: ../src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Изход от програмата"
 
-#: ../src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Локален"
 
-#: ../src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Локален/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Локален/Отваряне на URL..."
 
-#: ../src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Локален/Прекъсване на връзката"
 
-#: ../src/gtk/gftp-gtk.c:264 ../src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Локален/sep"
 
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Локален/Променяне на файлова спецификация..."
 
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Локален/Показване на избраното"
 
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Локален/Избиране на всичко"
 
-#: ../src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Локален/Избиране на всички файлове"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Локален/Отказване на всичко избрано"
 
-#: ../src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Локален/Запис на съдържание на папка..."
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Локален/Изпращане на командата SITE..."
 
-#: ../src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Локален/Смяна на папката"
 
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Локален/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Локален/Създаване на папка"
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Файл/Нова папка..."
 
-#: ../src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Локален/Преименуване..."
 
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Локален/Изтриване..."
 
-#: ../src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Локален/Редактиране..."
 
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Локален/Преглед..."
 
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Локален/Обновяване"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Отдалечен"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Отдалечен/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Отдалечен/Отваряне на _URL..."
 
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Отдалечен/Прекъсване на връзката"
 
-#: ../src/gtk/gftp-gtk.c:287 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Отдалечен/sep"
 
-#: ../src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Отдалечен/Промяна на файлова спецификация..."
 
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Отдалечен/Показване на избраното"
 
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Отдалечен/Избиране на всичко"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Отдалечен/Избиране на всички файлове"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Отдалечен/Отказване от всичко избрано"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Отдалечен/Запис на съдържание на папка..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Отдалечен/Изпращане на команда SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Отдалечен/Смяна на папката"
 
-#: ../src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Отдалечен/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr "/Отдалечен/Създаване на папка..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Файл/Нова папка..."
 
-#: ../src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Отдалечен/Преименуване..."
 
-#: ../src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Отдалечен/Изтриване..."
 
-#: ../src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Отдалечен/Редактиране..."
 
-#: ../src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Отдалечен/Преглед..."
 
-#: ../src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Отдалечен/Обновяване"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/О_тметки"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Отметки/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Отметки/Добавяне на отметка"
 
-#: ../src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Отметки/Редактиране на отметки"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Отметки/sep"
 
-#: ../src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Трансфер"
 
-#: ../src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Трансфер/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/Трансфер/Започване на пренос"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Трансфер/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/Трансфер/Спиране на пренос"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Трансфер/sep"
 
-#: ../src/gtk/gftp-gtk.c:315 ../src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Трансфер/sep"
 
-#: ../src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Трансфер/Прескачане на текущия файл"
 
-#: ../src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Трансфер/Премахване на файл"
 
-#: ../src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Трансфери/Преместване нагоре"
 
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Трансфери/Преместване надолу"
 
-#: ../src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Трансфер/Получаване на файлове"
 
-#: ../src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Трансфер/Поставяне на файлове"
 
-#: ../src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/_Журнал"
 
-#: ../src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Журнал/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Журнал/Изчистване"
 
-#: ../src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
 msgstr "/Дневник/Преглед на дневник"
 
-#: ../src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Журнал/Запазване на дневник..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Инструменти"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Инструменти/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Инструменти/Сравняване на прозорци"
 
-#: ../src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Инструменти/Изчистване на временната памет"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Помощ"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Помощ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Помощ/Относно"
 
-#: ../src/gtk/gftp-gtk.c:458
-msgid "Host: "
-msgstr "Хост: "
-
-#: ../src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Хост: "
 
-#: ../src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtk/gftp-gtk.c:507
-msgid "User: "
-msgstr "Потребител: "
-
-#: ../src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Потребител: "
 
-#: ../src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Парола: "
 
-#: ../src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Команда:"
 
-#: ../src/gtk/gftp-gtk.c:746 ../src/gtk/gftp-gtk.c:952
-#: ../src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Име на файл"
 
-#: ../src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Размер"
 
-#: ../src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Дата"
 
-#: ../src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Атрибути"
 
-#: ../src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Прогрес"
 
-#: ../src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Грешка: Трябва да зададете хост, с който да се осъществи връзка\n"
 
-#: ../src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Обновяване"
 
-#: ../src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Въведете потребителско име"
 
-#: ../src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Въведете потребителското си име за този сайт"
 
-#: ../src/gtk/gtkui.c:119 ../src/gtk/transfer.c:555 ../src/gtk/transfer.c:565
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Въведете паролата си за този сайт"
 
-#: ../src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Операцията е прекъсната... трябва да въведете низ\n"
 
-#: ../src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Създаване на папка"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Въведете име на папката"
 
-#: ../src/gtk/gtkui.c:346 ../src/gtk/gtkui.c:358 ../src/gtk/misc-gtk.c:949
-#: ../src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Преименуване"
 
-#: ../src/gtk/gtkui.c:356
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Искате ли да преименувате %s?"
 
-#: ../src/gtk/gtkui.c:378 ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Сайт"
 
-#: ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Въведете команда за спецификация на сайт"
 
-#: ../src/gtk/gtkui.c:382
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Добавяне на SITE отпред"
 
-#: ../src/gtk/gtkui.c:425 ../src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:450
-#: ../src/gtk/transfer.c:533 ../src/gtk/transfer.c:1012
+#: 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:512
-#: ../src/gtk/transfer.c:537
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Изчакване..."
 
-#: ../src/gtk/gtkui_transfer.c:124 ../src/gtk/gtkui_transfer.c:303
-#: ../src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Презаписване"
 
-#: ../src/gtk/gtkui_transfer.c:131 ../src/gtk/gtkui_transfer.c:309
-#: ../src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Възстановяване"
 
-#: ../src/gtk/gtkui_transfer.c:138 ../src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Прескачане"
 
-#: ../src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Действие"
 
-#: ../src/gtk/gtkui_transfer.c:224 ../src/gtk/gtkui_transfer.c:233
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Пренос на файлове"
 
-#: ../src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2642,62 +2684,61 @@ msgstr ""
 "Следните файлове съществуват на двата компютъра\n"
 "Изберете какво искате да правите"
 
-#: ../src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Прескачане на файл"
 
-#: ../src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Избиране на всичко"
 
-#: ../src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Отказване от всички избрано"
 
-#: ../src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Промяна на файлова спецификация: Операцията прекъсна... трябва да зададете "
 "низ\n"
 
-#: ../src/gtk/menu-items.c:74 ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Промяна на файлова спецификация"
 
-#: ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Въведете нова файлова спецификация"
 
-#: ../src/gtk/menu-items.c:105 ../src/gtk/menu-items.c:313
-#: ../src/gtk/menu-items.c:377 ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Грешка: Не може да се отвори %s за запис: %s\n"
 
-#: ../src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Запис на съдържанието на папка"
 
-#: ../src/gtk/menu-items.c:341 ../src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Грешка: Грешка при запис в %s: %s\n"
 
-#: ../src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Успешно се записа журнала във файла %s\n"
 
-#: ../src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Запазване на Журнал"
 
-#: ../src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2706,44 +2747,39 @@ msgstr ""
 "Не може да се намери файла с лицензното споразумение (COPYING). Убедете се, "
 "че е в %s или %s"
 
-#: ../src/gtk/menu-items.c:468 ../src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Относно gFTP"
 
-#: ../src/gtk/menu-items.c:504
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Авторски права (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Официална Страница: http://www.gftp.org/\n";
 "Лого от: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Относно"
 
-#: ../src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Лицензно споразумение"
 
-#: ../src/gtk/menu-items.c:571 ../src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr "  Затваряне  "
-
-#: ../src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Сравняване на прозорци"
 
-#: ../src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Прекъсване на връзката с отдалечения сървър"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2751,72 +2787,56 @@ msgstr ""
 "Свързване към сайта зададен в полето за сървър. Ако то е празно, се появява "
 "диалог, в който можете да зададете URL."
 
-#: ../src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Всички файлове"
 
-#: ../src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Във временната памет) ["
 
-#: ../src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Не е свързан"
 
-#: ../src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Грешка при отваряне на файл %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Не е свързан с отдалечен сайт\n"
 
-#: ../src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Тези функции не са налични за използване с този протокол\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Трябва да изберете само един обект\n"
 
-#: ../src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Трябва да сте избрали поне един обект\n"
 
-#: ../src/gtk/misc-gtk.c:943 ../src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Промяна"
 
-#: ../src/gtk/misc-gtk.c:1014 ../src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Добавяне"
-
-#: ../src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Прекъсване"
-
-#: ../src/gtk/misc-gtk.c:1110
-msgid "  Yes  "
-msgstr "  Да  "
-
-#: ../src/gtk/misc-gtk.c:1120
-msgid "  No  "
-msgstr "  Не  "
-
-#: ../src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Получаване на списък на папка"
 
-#: ../src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Спира  "
 
-#: ../src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2825,105 +2845,89 @@ msgstr ""
 "Получени %ld папки\n"
 "и %ld файлове"
 
-#: ../src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Грешка на gFTP: Не може да се намери файл %s в %s или %s\n"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Редактиране на хост"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Добавяне на хост"
 
-#: ../src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../src/gtk/options_dialog.c:1017 ../src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Домейн"
 
-#: ../src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr "Адрес в мрежата"
-
-#: ../src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Мре_жов адрес"
 
-#: ../src/gtk/options_dialog.c:1091 ../src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr "Мрежова маска"
-
-#: ../src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Мр_ежова маска"
 
-#: ../src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Домейн:"
 
-#: ../src/gtk/options_dialog.c:1250
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Мрежова маска"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Локални хостове"
 
-#: ../src/gtk/options_dialog.c:1291 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Редактиране"
-
-#: ../src/gtk/options_dialog.c:1293
-msgid "_Edit"
-msgstr "_Редактиране"
-
-#: ../src/gtk/options_dialog.c:1370 ../src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Настройки"
 
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Получаване имената на файлове..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:681
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Свързване..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Прехвърляне на файлове: Няма връзка с отдалечения сайт\n"
 
-#: ../src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Грешка: Подчинен процес %d върна %d\n"
 
-#: ../src/gtk/transfer.c:358
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Синовен %d върна успешно\n"
 
-#: ../src/gtk/transfer.c:362
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Грешка: Дъщерният процес %d завърши аварийно\n"
 
-#: ../src/gtk/transfer.c:372
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Грешка: Не може да се получи информация за файла %s: %s\n"
 
-#: ../src/gtk/transfer.c:377
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Файлът %s не е променен\n"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2932,121 +2936,214 @@ msgstr ""
 "Файлът %s е бил променен.\n"
 "Искате ли да го качите?"
 
-#: ../src/gtk/transfer.c:388
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Редактиране на файл"
 
-#: ../src/gtk/transfer.c:453
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Завърши"
 
-#: ../src/gtk/transfer.c:493
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Спиране на преноса на %s\n"
-
-#: ../src/gtk/transfer.c:727
-#, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
-msgstr "Не е ясно какъв процент е завършен. (Файл %ld от общо %ld)"
-
-#: ../src/gtk/transfer.c:731
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% завършено, %02d:%02d:%02d прибл. време остава. (Файл %ld от %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr ""
+"Получен %s от %s със %.2fКБ/с, %02d:%02d:%02d приблизително оставащо време"
 
-#: ../src/gtk/transfer.c:761
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Получен %s от %s със %.2fКБ/с, %02d:%02d:%02d приблизително оставащо време"
 
-#: ../src/gtk/transfer.c:770
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Получен %s от %s, прехвърлянето забавено, неизвестно оставащо време"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Получен %s от %s, прехвърлянето забавено, неизвестно оставащо време"
 
-#: ../src/gtk/transfer.c:805
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr "Не е ясно какъв процент е завършен. (Файл %ld от общо %ld)"
+
+#: 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 прибл. време остава. (Файл %ld от %ld)"
+
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Получават се имена на файлове...%s байта"
 
-#: ../src/gtk/transfer.c:884 ../src/gtk/transfer.c:906
-#: ../src/gtk/transfer.c:940 ../src/gtk/transfer.c:980
-#: ../src/gtk/transfer.c:1033 ../src/gtk/transfer.c:1093
+#: 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"
 
-#: ../src/gtk/transfer.c:924
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Спиране на преноса от хост %s\n"
-
-#: ../src/gtk/transfer.c:965 ../src/gtk/transfer.c:1018
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Прескача файла %s от хост %s\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:34
+msgid "Edit"
+msgstr "Редактиране"
+
+#: 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 "Преглед: Не може да се направи fork за друг процес: %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:271
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Отваряне на %s с %s\n"
 
-#: ../src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Преглеждане на файла %s\n"
 
-#: ../src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Преглед: Не може да се отвори файла %s: %s\n"
 
-#: ../src/text/gftp-text.c:176
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Управляващият терминал не може да бъде отворен %s\n"
 
-#: ../src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Потребител [анонимен]:"
 
-#: ../src/text/textui.c:143
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s вече съществува. (%s размер на източника, %s размер на "
 "предназначението):\n"
 "Презаписва, Продължава, Пропуска, Презаписва всички, Продължава всички, "
 "Пропуска всички: (%c)"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Начална папка:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Подразбиращата се папка на gFTP при стартиране"
+
+#~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+#~ msgstr ""
+#~ "Грешка при преобразуване на низа „%s“ от текущия локал към UTF-8: %s\n"
+
+#~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+#~ msgstr ""
+#~ "Грешка при преобразуване на низа „%s“ от UTF-8 към текущия локал: %s\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 ""
+#~ ">. Ако имате някакви въпроси, коментари или предложения за тази програма "
+#~ "ни пишете. Можете винаги да намерите последните новини за gFTP от http://";
+#~ "www.gftp.org/\n"
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Грешка: Отдалеченият сайт прекъсна връзката след опит за прехвърляне на "
+#~ "файл\n"
+
+#~ msgid "There was an error transfering the file %s"
+#~ msgstr "Появи се грешка при преноса на файла %s"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Отказване  "
+
+#~ msgid "Apply"
+#~ msgstr "Прилагане"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Връзка през URL"
+
+#~ msgid "OpenURL"
+#~ msgstr "OpenURL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Настройки..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Локален/Създаване на папка"
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Отдалечен/Създаване на папка..."
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Трансфер/Започване на пренос"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Трансфер/Спиране на пренос"
+
+#~ msgid "Host: "
+#~ msgstr "Хост: "
+
+#~ msgid "User: "
+#~ msgstr "Потребител: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Затваряне  "
+
+#~ msgid "Add"
+#~ msgstr "Добавяне"
+
+#~ msgid "Cancel"
+#~ msgstr "Прекъсване"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Да  "
+
+#~ msgid "  No  "
+#~ msgstr "  Не  "
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Network Address"
+#~ msgstr "Адрес в мрежата"
+
+#~ msgid "_Edit"
+#~ msgstr "_Редактиране"
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Спиране на преноса на %s\n"
diff --git a/po/bn.po b/po/bn.po
index 0074ed8..03d98fc 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-23 00:13-0400\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-07-06 20:21+0530\n"
 "Last-Translator: Indranil Das Gupta <indradg cal vsnl net in>\n"
 "Language-Team: Bangla <gnome-translation bengalinux org>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "বেঠিক ইউ-আর-এল %s\n"
@@ -25,53 +26,76 @@ msgstr "বেঠিক ইউ-আর-এল %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ত্রুটি: ক্যাস ইনডেক্স ফাইলে বেঠিক লাইন %s\n"
 
-#: lib/cache.c:136 lib/local.c:534
+#: 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"
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "ত্রুটি: সাময়িক (tmp) ফাইল তৈরির চেস্টা ব্যর্থ:  %s\n"
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:292 lib/misc.c:298 lib/rfc2068.c:263 lib/sshv2.c:997
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "ফাইল ডেসক্রিপ্টার বন্ধ করতে ত্রুটি: %s\n"
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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য়ে খোঁজ (seek) করতে ব্যর্থ: %s\n"
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr "ত্রুটি: স্থানীয় ফাইল %s খোলার প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr "ত্রুটি: সকেটে লেখার প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr "ত্রুটি: সকেট থেকে পড়ার প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "জীএফটিপি ত্রুটি: বুকমার্ক ফাইলের নাম বেঠিক %s\n"
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "হুশিয়ারি: প্রধান বুকমার্ক ফাইল %s পাওয়া যায়নি\n"
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "জীএফটিপি ত্রুটি: বুকমার্ক ফাইল %s খোলা সম্ভব হয়নি: %s\n"
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "জীএফটিপি হুশিয়ারি: বুকমার্ক ফাইলের লাইন %d বাদ দেওয়া হচ্ছে: %s\n"
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "জীএফটিপি হুশিয়ারি: লাইন %d-তে মানের সংখ্যা অপর্যাপ্ত\n"
 
-#: lib/config_file.c:442
+#: 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 "
@@ -81,7 +105,7 @@ msgstr ""
 "(যদি থেকে থাকে) ব্যবহার করার প্রয়োজন নেই । ব্যবহার পদ্ধতি:  dont_use_proxy=."
 "domain বা dont_use_proxy=network number/netmask"
 
-#: lib/config_file.c:445
+#: 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"
@@ -89,61 +113,72 @@ msgstr ""
 "ext=ফাইল এক্সটেনশন:এক্স-পি-এম ফাইল:অ্যাসকি বা বাইনারি (A বা B):ভিউয়ার প্রোগ্রাম । "
 "মনে রাখবেন: ফাইল এক্সটেনশনই একমাত্র আবশ্যক মান"
 
-#: lib/config_file.c:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "জীএফটিপি ত্রুটি: কনফিগ ফাইল %s নাম ভুল\n"
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "জীএফটিপি ত্রুটি: ডিরেক্টরি %s তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "জীএফটিপি ত্রুটি: প্রধান কনফিগ ফাইল %s পাওয়া যায়নি\n"
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr "আপনি কি make install করতে চান?\n"
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "জীএফটিপি ত্রুটি: কনফিগ ফাইল %s খোলার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "কনফিগ ফাইলের লাইন %d তে পার্স (parse) ত্রুটির দরুণ এটি বন্ধ করা হচ্ছে\n"
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "জীএফটিপি হুশিয়ারি: কনফিগ ফাইলের লাইন %d বাদ দেওয়া হচ্ছে: %s\n"
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "জীএফটিপি ত্রুটি: বেঠিক লগ ফাইল নাম %s\n"
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "জীএফটিপি হুশিয়ারি: %s লেখার জন্য খোলার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "জীএফটিপির বুকমার্ক ফাইল: কপিরাইট (ক) ১৯৯৮ - ২০০২ ব্র্যায়ান ম্যাসনি <masneyb gftp "
 "org> ।  হুশিয়ারি: এই ফাইলে আপনার লেখা কোন মন্তব্যের সংরক্ষণ সম্ভব নয়"
 
-#: lib/config_file.c:763
+#: lib/config_file.c:733
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: lib/config_file.c:845
+#, fuzzy
+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 ""
@@ -151,160 +186,209 @@ msgstr ""
 "org> ।  হুশিয়ারি: এই ফাইলে আপনার লেখা কোন মন্তব্যের সংরক্ষণ সম্ভব নয় । কোন এন্ট্রির "
 "মন্তব্যে যদি (*) চিহ্ন থাকে, তাহলে জীএফটিপির মধ্যে এটির কোন পরিবর্তন সম্ভব নয়"
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<অজ্ঞাত>"
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 "মারাত্মক জীএফটিপি ত্রুটি: গ্লোবাল হ্যাস তালিকায়ে কনফিগ অপশন '%s' পাওয়া যায়নি\n"
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"এস-এস-এল সমর্থন ছাড়া কমপাইল করার দরুণ এইচ-টি-টি-পি-এস অসমর্থিত । সংযোগ বিচ্ছিন্ন "
-"করা হচ্ছে\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "ত্রুটি: স্থানীয় ফাইল %s খোলার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "স্থানীয় ডিরেক্টরি %s তে যাবার প্রচেষ্টা ব্যর্থ: %s\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "ত্রুটি: ফাইল %sয়ে খোঁজ (seek) করতে ব্যর্থ: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "বর্তমান ডিরেক্টরির নাম জানার প্রচেষ্টা ব্যর্থ: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "ত্রুটি: %s-য়ে লেখার চেষ্টায়ে ত্রুটি: %s\n"
 
-#: lib/local.c:179
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "ত্রুটি: স্থানীয় ফাইল %s ছাঁটার প্রচেষ্টা ব্যর্থ: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "সার্ভার থেকে আসা সংযোগ গ্রহণ করা সম্ভব নয়: %s\n"
 
-#: lib/local.c:404
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
+#: 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 "অজ্ঞাত"
+
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "স্থানীয় ডিরেক্টরি তালিকা আনার প্রচেষ্টা ব্যর্থ %s: %s\n"
 
-#: lib/local.c:441
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "স্থানীয় ডিরেক্টরি %s-তে যাবার প্রচেষ্টা সফল\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:914
-#: src/gtk/view_dialog.c:301
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "স্থানীয় ডিরেক্টরি %s তে যাবার প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s মুছে ফেলার প্রচেষ্টা সফল\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "ত্রুটি: ডিরেক্টরি %s মুছে ফেলার চেষ্টা ব্যর্থ: %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:918 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ত্রুটি: ফাইল %s মুছে ফেলার চেষ্টা ব্যর্থ: %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "ডিরেক্টরি %s তৈরির প্রচেষ্টা সফল\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s-কে %s-য়ে পুনঃনামাকরণের প্রচেষ্টা সফল\n"
 
-#: lib/local.c:560
+#: 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/local.c:583
-#, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "%s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা সফল\n"
+#: lib/ftps.c:156
+#, fuzzy
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"এস-এস-এল সমর্থন ছাড়া কমপাইল করার দরুণ এইচ-টি-টি-পি-এস অসমর্থিত । সংযোগ বিচ্ছিন্ন "
+"করা হচ্ছে\n"
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"এস-এস-এল সমর্থন ছাড়া কমপাইল করার দরুণ এইচ-টি-টি-পি-এস অসমর্থিত । সংযোগ বিচ্ছিন্ন "
+"করা হচ্ছে\n"
 
-#: lib/local.c:590
+#: lib/local.c:66
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
-msgstr "ত্রুটি: %s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা ব্যর্থ: %s\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "বর্তমান ডিরেক্টরির নাম জানার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/local.c:682
-msgid "local filesystem"
-msgstr "স্থানীয় ফাইলব্যবস্থা"
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "স্থানীয় ডিরেক্টরি %s-তে যাবার প্রচেষ্টা সফল\n"
 
-#: lib/misc.c:261 lib/misc.c:268 lib/protocols.c:2519
+#: lib/local.c:112
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
-msgstr "ত্রুটি: স্থানীয় ফাইল %s খোলার প্রচেষ্টা ব্যর্থ: %s\n"
+msgid "Could not change local directory to %s: %s\n"
+msgstr "স্থানীয় ডিরেক্টরি %s তে যাবার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/misc.c:278 lib/protocols.c:2237 lib/sslcommon.c:467
+#: lib/local.c:238
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
-msgstr "ত্রুটি: সকেটে লেখার প্রচেষ্টা ব্যর্থ: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "ত্রুটি: স্থানীয় ফাইল %s ছাঁটার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/misc.c:286 lib/protocols.c:2165 lib/sslcommon.c:421
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
-msgstr "ত্রুটি: সকেট থেকে পড়ার প্রচেষ্টা ব্যর্থ: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "স্থানীয় ডিরেক্টরি তালিকা আনার প্রচেষ্টা ব্যর্থ %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "%s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা সফল\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "ত্রুটি: %s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "%s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা সফল\n"
 
-#: lib/misc.c:442
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "ত্রুটি: %s-য়ের অনুমতি %d-তে পরিবর্তনের প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr "স্থানীয় ফাইলব্যবস্থা"
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
 msgstr ""
-"ব্যবহার পদ্ধতি: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "কোনটাই নয়"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "ফাইল"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "আয়তন"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "মালিক"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "গ্রুপ"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "দিনতারিখ"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "বৈশিষ্টাবলী"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "অবরোহণ"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "আরোহণ"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "সাধারণ"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "প্রদর্শক প্রোগ্রাম:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -312,35 +396,27 @@ msgstr ""
 "ফাইল দেখানোর জন্য ব্যবহর্য ডিফল্ট প্রোগ্রাম । এটি ফাঁকা রাখলে অভ্যন্তরীণ ফাইল ভিউয়ার "
 "ব্যবহার করা হবে"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "এডিটর প্রোগ্রাম:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ফাইল এডিট বা পরিবর্তন করার ডিফল্ট প্রোগ্রাম"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "শুরু হবার ডিরেক্টরি:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "জীএফটিপি চালু হবার পরেই যে ডিরেক্টরিতে যাবে"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "লগ উইন্ডোর সর্বাপেক্ষা বৃহত আয়তন:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "বাইটের হিসেব অনুসারে GTK+ পোর্টর লগ উইন্ডোর সর্বাপেক্ষা বৃহত আয়তন"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "দূরবর্তী ক্যারেক্টার সেটসমূহ:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -348,119 +424,203 @@ msgstr ""
 "এটি কোমা চিহ্ন দ্বারা আলাদা করা ক্যারসেটের তালিকা বিশেষ যার ব্যবহারে দূরবর্তী "
 "বার্তাসমূহ বর্তমান স্থানপরিচয়ে (locale) রুপান্তরিত হবে"
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ফাইল স্থানান্তর সংক্রান্ত তথ্য যোগ করা হোক"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "নতুন ফাইল স্থানান্তর সংক্রান্ত তথ্য বর্তমান তথ্যের সংগে যোগ করা হোক"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "একটি একটি করেই ফাইল স্থানান্তর করা হোক"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "যে কোন সময়ে শুধু একটি করেই ফাইল স্থানান্তর করা হোক"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "সাধারণ ভাবে মুছে ফেলেই লেখা হবে"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "সাধারণ ভাবে মুছে ফেলেই লেখা হবে বা ফাইল স্থানান্তর পুনরারম্ভ করা হবে"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ফাইল অনুমতি যেমন আছে তেমনই বজায় রাখা হোক"
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "স্থানান্তরিত ফাইলসমূহের ফাইল অনুমতি বজায় রাখা হোক"
 
-#: lib/options.h:75
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "ফাইল অনুমতি যেমন আছে তেমনই বজায় রাখা হোক"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "স্থানান্তরিত ফাইলসমূহের ফাইল অনুমতি বজায় রাখা হোক"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "প্রতি ফাইল স্থানান্তরের পরে রিফ্রেশ করা হোক"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "প্রতি ফাইল স্থানান্তরের পরে তালিকা (লিস্টবক্স) রিফ্রেশ করা হোক"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "প্রথমে ডিরেক্টরিসমূহ ক্রমানয়ে সাজানো হোক"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "আগে সব ডিরেক্টরি তার পরে সব ফাইল"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "লুকোনো ফাইল দেখানো হোক"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "লুকোনো ফাইল সব লিস্টবক্সের মধ্যে দেখানো হোক"
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1048
-#: src/gtk/options_dialog.c:1141
+#: lib/options.h:100
+#, fuzzy
+msgid "Show transfer status in title"
+msgstr "একটি একটি করেই ফাইল স্থানান্তর করা হোক"
+
+#: lib/options.h:102
+#, fuzzy
+msgid "Show the file transfer status in the titlebar"
+msgstr "লুকোনো ফাইল সব লিস্টবক্সের মধ্যে দেখানো হোক"
+
+#: lib/options.h:103
+#, fuzzy
+msgid "Start file transfers"
+msgstr "অক্রিয় ফাইল স্থানান্তর"
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "একটি নির্দিষ্ট স্থানীয় ডিরেক্টরি মুছে ফেলে"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "নেটওয়ার্ক টাইমআউট:"
 
-#: lib/options.h:94
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "নেটওয়ার্ক ইনপুট/আউটপুটের টাইমআউট সীমা । এটি অলস (idle) টাইমআউট নয়"
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "সংযোগ পুনঃপ্রচেষ্টার সীমা:"
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "সংযোগের পুনঃপ্রচেষ্টার সীমা। এটিতে 0 বসালে পুনঃপ্রচেষ্টার কোন সীমা থাকবে না"
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "পুনঃপ্রচেষ্টার মধ্যে সময়ের অন্তর:"
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "পুনঃপ্রচেষ্টার মধ্যে সেকেন্ডের হিসেবে সময়ের অন্তর"
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "সর্বাধিক কে-বি/সেক:"
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "সর্বাধিক যত কে-বি/সেক একটি ফাইল স্থানান্তরিত হতে পারে (নিস্ক্রিয় করতে হলে 0 বসিয়ে "
 "দিন)"
 
-#: lib/options.h:111
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "ফাইল স্থানান্তরকরণ"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ডিফল্ট প্রোটোকল:"
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "যেটিকে ডিফল্ট প্রোটোকল হিসেবে নির্দিষ্ট করা হ"
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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"
@@ -468,27 +628,27 @@ msgstr ""
 "এটির দ্বারা ঠিক হয়ে থাকে যে ফাইল লিস্টবক্সে (তালিকায়ে) দুবার ক্লিক করলে কি করা "
 "হবে 0=ফাইল প্রদর্শন করা হবে 1=ফাইল এডিট করা হবে 2=ফাইল স্থানান্তর করা হবে"
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "স্থানীয় ফাইল লিস্টবক্সের (তালিকার) ডিফল্ট প্রস্থ"
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "দূরবর্তী ফাইল লিস্টবক্সের (তালিকার) ডিফল্ট প্রস্থ"
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "স্থানীয়/দূরবর্তী ফাইল লিস্টবক্সের (তালিকার) ডিফল্ট উচ্চতা"
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "স্থানান্তর তালিকার ডিফল্ট উচ্চতা"
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "লগ করবার উইন্ডোর ডিফল্ট উচ্চতা"
 
-#: lib/options.h:135
+#: 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."
@@ -496,15 +656,15 @@ msgstr ""
 "স্থানান্তরকরণ উইন্ডোয়ে ফাইলনামের কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন "
 "অনুসারে নিজের থেকে ছোট-বড় হবে"
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ক্রমানুসারে সাজানোর ডিফল্ট কলাম"
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "আরোহী বা অবরোহী ক্রমে সাজানো"
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -512,7 +672,7 @@ msgstr ""
 "ফাইল তালিকায়ে ফাইলনামের কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন অনুসারে "
 "নিজের থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -520,7 +680,7 @@ msgstr ""
 "ফাইল তালিকায়ে আয়তন কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন অনুসারে "
 "নিজের থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -528,7 +688,7 @@ msgstr ""
 "ফাইল তালিকায়ে মালিক কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন অনুসারে "
 "নিজের থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -536,7 +696,7 @@ msgstr ""
 "ফাইল তালিকায়ে গ্রুপ কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন অনুসারে নিজের "
 "থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -544,7 +704,7 @@ msgstr ""
 "ফাইল তালিকায়ে তারিখ কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন অনুসারে "
 "নিজের থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -552,204 +712,176 @@ msgstr ""
 "ফাইল তালিকায়ে বৈশিষ্টাবলী কলামের প্রস্থ ।  এটিতে 0 বসালে এই কলামটি প্রয়োজন "
 "অনুসারে নিজের থেকে ছোট-বড় হবে ।  -1 বসিয়ে এই কলানটি নিস্ক্রিয করা যায়"
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "সার্ভারকে পাঠানো বার্তায়ে ব্যবহৃত রং"
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "সার্ভার থেকে প্রাপ্ত বার্তায়ে ব্যবহৃত রং"
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ত্রুটি সংক্রান্ত বার্তায়ে ব্যবহৃত রং"
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "অন্যান্য লগ বার্তায়ে ব্যবহৃত রং"
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "এফ-টি-পি"
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "এইচ-টি-টি-পি"
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "এইচ-টি-টি-পি-এস"
 
-#: lib/options.h:210
+#: lib/options.h:270
 msgid "Local"
 msgstr "স্থানীয়"
 
-#: lib/options.h:211
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "এসএসএইচ২"
 
-#: lib/options.h:212 src/gtk/bookmarks.c:860
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "বুকমার্ক"
 
-#: lib/protocols.c:168 lib/protocols.c:193
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "এফ-টি-পি"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ফাইল স্থানান্তরের গতি %.2f কে-বি/সেক এর মধ্যে নিয়ন্তিত হবে\n"
 
-#: lib/protocols.c:322
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
+msgstr "%s ডিরেকটরি তালিকা ক্যাস থেকে লোড করা হচ্ছে\n"
+
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "%s ডিরেকটরি তালিকা ক্যাস থেকে লোড করা হচ্ছে\n"
 
-#: lib/protocols.c:467
+#: lib/protocols.c:450
+#, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ত্রুটি: ক্যাসে লেখার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/protocols.c:499
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ত্রুটি: বুকমার্ক %s পাওয়া যায়নি\n"
 
-#: lib/protocols.c:506
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "বুকমার্ক ত্রুটি: %s বুকমার্ক এন্ট্রিতে কোন হোস্টের না নেই\n"
 
-#: lib/protocols.c:614
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "প্রোটোকল  '%s' বর্তমানে সমর্থিত নয়\n"
 
-#: lib/protocols.c:931 lib/protocols.c:946 lib/protocols.c:1762
-#: lib/protocols.c:1871
-#, c-format
-msgid "Looking up %s\n"
-msgstr "খোঁজ করা হচ্ছে %s-য়ের জন্য\n"
-
-#: lib/protocols.c:937 lib/protocols.c:952 lib/protocols.c:1767
-#: lib/protocols.c:1876
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "হোস্ট নাম %s খুঁজে পাওয়ার প্রচেষ্টা ব্যর্থ: %s\n"
-
-#: lib/protocols.c:1209 lib/protocols.c:1210 lib/protocols.c:1269
-#: lib/protocols.c:1276 lib/protocols.c:1355 lib/protocols.c:1356
-#: lib/protocols.c:1390
-msgid "unknown"
-msgstr "অজ্ঞাত"
-
-#: lib/protocols.c:1785 lib/protocols.c:1828 lib/rfc959.c:589 lib/rfc959.c:736
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "সকেট তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
-
-#: lib/protocols.c:1791 lib/protocols.c:1890
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "সংযোগের চেষ্টা করা হচ্ছে %s:%d\n"
-
-#: lib/protocols.c:1796 lib/protocols.c:1897
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "%s সংগে সংযোগের প্রচেষ্টা ব্যর্থ: %s\n"
-
-#: lib/protocols.c:1852 lib/sshv2.c:895
+#: lib/protocols.c:1153
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
-"%s/টিসিপি নামের কোন সার্ভিস চালু নেই । আপনার সার্ভিসেস (services) ফাইলটি পরীক্ষা "
-"করে দেখুন\n"
-
-#: lib/protocols.c:1914 lib/protocols.c:2528 lib/rfc959.c:598 lib/rfc959.c:745
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "ত্রুটি: exec ফ্ল্যাগে ক্লোজ (close) নির্দিষ্ট করার প্রচেষ্টা ব্যর্থ: %s\n"
-
-#: lib/protocols.c:1921
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "%s-য়ের সংগে সংযোগ স্থাপিত: %d\n"
 
-#: lib/protocols.c:2145 lib/protocols.c:2216
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "%s-য়ের সংগে সংযোগ টাইম আউট হয়েছে\n"
-
-#: lib/protocols.c:2285
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "সকেট ফ্লাগসমূহের খোঁজ ব্যর্থ: %s\n"
-
-#: lib/protocols.c:2299
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "সকেট নন-ব্লকিং রুপে স্থাপনের প্রচেষ্টা ব্যর্থ: %s\n"
-
-#: lib/protocols.c:2425
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "ত্রুটি: দূরবর্তী সাইট %s-য়ের সংগে সংযোগ ছিন্ন। সর্বাধিক প্রচেষ্টার সীমা ছাড়িয়েছে..."
 "হাল ছেড়ে দেওয়া হোল\n"
 
-#: lib/protocols.c:2433
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "ত্রুটি: দূরবর্তী সাইট %s-য়ের সংগে সংযোগ ছিন্ন। %d সেকেন্ডের মধ্যে আবার সংযোগ করা "
 "হবে\n"
 
-#: lib/pty.c:288
+#: lib/protocols.c:1634 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 ফ্ল্যাগে ক্লোজ (close) নির্দিষ্ট করার প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/pty.c:301
+#, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr ""
+
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "জোড়া সকেট তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ত্রুটি: এসএসএইচ চালানোর প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "অন্য একটি প্রসেস ফর্ক (fork) করা প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "প্রক্সি হোস্টের নাম"
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ফায়ারওয়াল হোস্টের নাম"
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "প্রক্সি পোর্ট:"
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ফায়ারওয়ালে যুক্ত হবার পোর্ট"
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "প্রক্সিতে পরিচয়:"
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ফায়ারওয়ালে পরিচয়"
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "প্রক্সি পাসওয়ার্ড:"
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ফায়ারওয়াল পাসওয়ার্ড"
 
@@ -761,7 +893,7 @@ msgstr "এইচ-টি-টি-পি/১.১ ব্যবহৃত হোক"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "কি ব্যবহার করতে চান এইচ-টি-টি-পি/১.১ না এইচ-টি-টি-পি/১.০"
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -769,81 +901,66 @@ msgid ""
 msgstr ""
 
 # msgstr "সার্ভার থেকে বেঠিক উত্তর এসেছে, তাই সংযোগ ছিন্ন করা হচ্ছে\n"
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:992
+#: 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:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "ফাইল স্থানান্তর করা শুরু হচ্ছে অফসেট %lld থেকে\n"
-
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "ফাইল স্থানান্তর করা শুরু হচ্ছে অফসেট %ld থেকে\n"
 
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ফাইল %s আনা যায়নি\n"
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1077
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ডিরেক্টরি তালিকা তুলে আনা হচ্ছে...\n"
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
-msgstr ""
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
+msgstr "সার্ভার থেকে বেঠিক উত্তর এসেছে, তাই সংযোগ ছিন্ন করা হচ্ছে\n"
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr ""
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr ""
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ইমেল ঠিকানা:"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -851,19 +968,19 @@ msgstr ""
 "আপনি যখন কোন দূরবর্তী এফ-টি-পি সার্ভারে অজ্ঞাত পরিচয়ে (anon) লগিন করবেন তখন এই "
 "পাসওয়ার্ডটি ব্যবহার করা হবে"
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "প্রক্সি  অ্যাকাউন্ট:"
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "আপনার ফায়ারওয়াল অ্যাকাউন্ট (ঐচ্ছিক)"
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "প্রক্সি সার্ভার ধরণ:"
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -879,11 +996,23 @@ msgstr ""
 "(পাসওয়ার্ড), h (হোস্ট), o (পোর্ট) বা a (অ্যাকাউন্ট)।  উদাহরণ : প্রক্সির পরিচয়ের "
 "(user) জন্য আপনি দিতে পারেন %pu "
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "অক্রিয় ফাইল স্থানান্তর"
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -898,11 +1027,11 @@ msgstr ""
 "করে না। এটি নিস্ক্রিয় করা থাকলে জীএফটিপি ক্লায়ন্টের দিকে একটি পোর্ট খুলবে এবং "
 "দূরবর্তী সার্ভার তার মাধ্যমে সংযোগের প্রচেষ্টা করবে। "
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "দূরবর্তী সিমলিন্ক সমাধান করা হোক (LIST -L)"
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -913,15 +1042,16 @@ msgstr ""
 "(resolve) করার প্রচেষ্টা করবে। সাধারণত এটি করে রাখা ভালো। তবে যদি দূরবর্তী এফ-টি-"
 "পি সার্ভার LIST-য়ে L অপশন সমর্থন না করে, তবেই এটি আপনি নিস্ক্রিয় করতে পারেন"
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ফাইল স্থানান্তকরণ হোক অ্যাসকি পদ্ধতিতে"
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -931,66 +1061,134 @@ msgstr ""
 "স্থানান্তর করে থাকেন তা হলে এটি বাদ দিতে পারেন। যদি আপনি বাইনারি ডাটা ডাউনলোড "
 "করেন তাহলে এটিকে আপনা উচিত নিস্ক্রিয় করে রাখা"
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
-msgstr "পি-ডাব্লু-ডি কম্যান্ডের বেঠিক উত্তর পাওয়া গেছে: '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, fuzzy, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "সকেট তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "পি-এ-এস-ভি উত্তরে কোন আই-পি অ্যাডরেস পাওয়া যায়নি '%s'\n"
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "পি-এ-এস-ভি উত্তরে কোন আই-পি অ্যাডরেস পাওয়া যায়নি '%s'\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "তথ্য সংযোগ তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: 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:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "পোর্টে সংযোজনের (bind) প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: 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:756
+#: lib/rfc959.c:876
+#, fuzzy, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr "সকেট তৈরির প্রচেষ্টা ব্যর্থ: %s\n"
+
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "মনে হয় না যে আমরা আই-পি-ভি-৬-য়ের মাধ্যমে সংযুক্ত হয়েছি।  সংযোগ ছিন্ন করা হচ্ছে\n"
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "বেঠিক ই-পি-এস-ভি উত্তর '%s'\n"
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "স্থানীয় সকেটের অ্যাডরেস জানার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "সার্ভার থেকে আসা সংযোগ গ্রহণ করা সম্ভব নয়: %s\n"
 
-#: lib/rfc959.c:1422
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "সর্বমোট"
 
-#: lib/rfc959.c:1424
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "হুশিয়ারি: তালিকা পার্স (parse) করার প্রচেষ্টা ব্যর্থ %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/টিসিপি নামের কোন সার্ভিস চালু নেই । আপনার সার্ভিসেস (services) ফাইলটি পরীক্ষা "
+"করে দেখুন\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 "এসএসএইচ"
@@ -1011,210 +1209,191 @@ msgstr "এসএসএইচ অতিরিক্ত মান:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "এসএসএইচ প্রোগ্রামকে পাঠানোর উপযোগি অতিরিক্ত মানসমূহ"
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr "এসএসএইচ২ এসএফটিপি সার্ভার পাথ"
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr "ডিফল্ত দূরব্র্তী এসএসএইচ২ এসএফটিপি সার্ভার পাথ"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "এসএসএইচ পরিচয়/পাস আবশ্যক"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "এসএসএইচ দ্বারা সংযোগের জন্য একটি পরিচয়/পাসওয়ার্ড প্রয়োজন"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr "এসএসএইচ আস্কপাস ব্যবহার করা হোক"
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "এসএসএইচ আস্কপাস ব্যবহার করা হোক দূরবর্তী পাসওয়ার্ডটি দেওয়ার জন্য"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "প্রোগ্রাম %s চলছে\n"
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "এসএসএইচ২ এসএফটিপি ব্যবস্থা ব্যবহার করা হোক"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
-"এসএসএইচ-কে -s এসএফটিপি ফ্লাগ সমেত ডাকা । এটি ব্যবহারের সুবিধা এই যে দূরবর্তী "
-"এসএফটিপি সার্ভারের দূরবর্তী পাথ আপনার জানার কোন প্রয়োজন নেই"
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
-msgstr "প্রোগ্রাম %s চলছে\n"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "পাসওয়ার্ড:"
 
-#: lib/sshv2.c:304 lib/sshv2.c:329
-msgid "WARNING"
-msgstr "**সাবধান**"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "পাসওয়ার্ড:"
 
-#: lib/sshv2.c:371
-msgid "Error: An incorrect password was entered\n"
-msgstr "ত্রুটি: ভুল পাসওয়ার্ড দেওয়া হয়েছিল\n"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr ""
 
-#: lib/sshv2.c:374
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
-"কম্যান্ড লাইন এসএসএইচ ব্যবহার করে এই হোস্টের সংগে সংযোগ করে এই প্রশ্নের যথাযথ উত্তর "
-"দিন\n"
 
-#: lib/sshv2.c:377
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr "এই হোস্টের সংগে সংযোগ স্থাপনের জন্য উপরোক্ত সর্তকবার্তার কারণটি ঠিক করুন\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "আপনার পাসওয়ার্ড দিন"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "আপনার পাসওয়ার্ড দিন"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "ত্রুটি: ভুল পাসওয়ার্ড দেওয়া হয়েছিল\n"
 
-#: lib/sshv2.c:416
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: প্রোটোকল চালু হচ্ছে\n"
 
-#: lib/sshv2.c:422
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: প্রোটোকল সংস্করণ %d\n"
 
-#: lib/sshv2.c:431
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: খোলা %s\n"
 
-#: lib/sshv2.c:436
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: বন্ধ\n"
 
-#: lib/sshv2.c:442
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: ডিরেক্টরি  %s খোলা হোক\n"
 
-#: lib/sshv2.c:447
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ডিরেক্টরি পড়া হোক\n"
 
-#: lib/sshv2.c:451
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ফাইল %s সরানো হোক\n"
 
-#: lib/sshv2.c:456
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: ডিরেক্টরি %s তৈরি করা হোক\n"
 
-#: lib/sshv2.c:461
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ডিরেক্টরি %s মুছে ফেলা হোক\n"
 
-#: lib/sshv2.c:466
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: আসলপাথ %s\n"
 
-#: lib/sshv2.c:471
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ফাইল বৈশিষ্টাবলী\n"
 
-#: lib/sshv2.c:475
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: স্ট্যাট %s\n"
 
-#: lib/sshv2.c:492
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: অনুমতি পরিবর্তন %s %o\n"
 
-#: lib/sshv2.c:497
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: উটাইম %s %d\n"
 
-#: lib/sshv2.c:510 src/gtk/bookmarks.c:1019 src/gtk/bookmarks.c:1256
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1106
-#: src/gtk/options_dialog.c:1308 src/gtk/transfer.c:2053
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ওকে"
 
-#: lib/sshv2.c:513
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "ই-ও-এফ"
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "এমন কোন ফাইল বা ডিরেক্টরি পাওয়া যায়নি"
 
-#: lib/sshv2.c:519
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "অনুমতি নেই"
 
-#: lib/sshv2.c:522
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ব্যর্থতা"
 
-#: lib/sshv2.c:525
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ত্রুটিপূণ বার্তা"
 
-#: lib/sshv2.c:528
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "কোন সংযোগ নেই"
 
-#: lib/sshv2.c:531
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "সংযোগ ছিন্ন হয়েছে"
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "নির্দিষ্ট প্রক্রিয়া অসমর্থিত"
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "সার্ভার একটি অজ্ঞাত বার্তা ফেরত পাঠিয়েছে"
 
-#: lib/sshv2.c:574
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ত্রুটি: বার্তার আয়তন %d অত্যাধিক বড়\n"
 
-#: lib/sshv2.c:632 lib/sshv2.c:1116 lib/sshv2.c:1951 lib/sshv2.c:2044
-#: lib/sshv2.c:2132
+#: 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"
 
-#: lib/sshv2.c:638
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:714 lib/sshv2.c:727 lib/sshv2.c:749 lib/sshv2.c:817
-#: lib/sshv2.c:948 lib/sshv2.c:1039 lib/sshv2.c:1107 lib/sshv2.c:1220
-#: lib/sshv2.c:1233 lib/sshv2.c:1246 lib/sshv2.c:1259 lib/sshv2.c:1315
-#: lib/sshv2.c:1380 lib/sshv2.c:1840 lib/sshv2.c:1942 lib/sshv2.c:2035
-#: lib/sshv2.c:2120 lib/sshv2.c:2205
-msgid "Received wrong response from server, disconnecting\n"
-msgstr "সার্ভার থেকে বেঠিক উত্তর এসেছে, তাই সংযোগ ছিন্ন করা হচ্ছে\n"
-
-#: lib/sshv2.c:866
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "এসএসএইচ সংযোগ স্থাপন করা হচ্ছে %s-য়ের সংগে\n"
 
-#: lib/sshv2.c:959
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "এসএসএইচ সার্ভার %s-য়ে লগিনের প্রচেষ্টা সফল\n"
@@ -1239,7 +1418,11 @@ msgstr "এন্ট্রোপি বীজের (seed) দৈর্ঘ্য
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "সর্বাধিক সংখ্যক বাইট যার দ্বারা এসএসএল ইন্জিনটিকে চালু (seed) করা যেতে পারে"
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1252,11 +1435,11 @@ msgstr ""
 "বিষয়  = %s\n"
 "ত্রুটি %i:%s\n"
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "সহযোগী (peer) শংসাপত্র পাওযার প্রচেষ্টা ব্যর্থ\n"
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1265,66 +1448,450 @@ msgstr ""
 "**ত্রুটি**: এসএসএল শংসাপত্রে উল্লেখিত হোস্ট (%s) আর আমরা যে হোস্টের সংগে সংযুক্ত আছি "
 "(%s) তা মেলেনি ।  সংযোগ ছিন্ন করা হচ্ছে\n"
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+#, fuzzy
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr "ওপেনএস-এস-এল লাইব্রেরি চালু করার প্রচেষ্টা ব্যর্থ\n"
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "ডিফল্ট এসএসএল শংসাপত্র লোড করার প্রচেষ্টা ব্যর্থ\n"
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "সাইফার (cipher) তালিকা নির্দিষ্ট করার প্রচেষ্টা ব্যর্থ (কোন সঠিক সাইফার পাওয়া "
 "যায়নি)\n"
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ত্রুটি: এসএসএল ইন্জিন চালু করা যায়নি\n"
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "এসএসএল সংযোগ স্থাপনে ত্রুটি (বি-আই-ও অবজেক্ট)\n"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "এসএসএল সংযোগ স্থাপনে ত্রুটি (এসএসএল অবজেক্ট)\n"
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "সহযোগী (peer) শংসাপত্র সংক্রান্ত ত্রুটি: %s\n"
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:912 src/gtk/menu-items.c:58
-#: src/gtk/menu-items.c:88 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr "নির্দিষ্ট প্রক্রিয়া বাতিল\n"
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "%d সেকেন্ড অপেক্ষা করা হচ্ছে আবার সংযোগের প্রচেষ্টা করার আগে\n"
+
+#: 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 ""
+"জীএফটিপি কোন রকম নির্ভরযোগ্যতার আশ্বাস দেয় না; বিস্তারিত বিবরণের জন্য কপিং "
+"(COPYING) ফাইলটি পড়ুন ।  এটি একটি ফ্রী সফ্টওয়ের এবং কিছু শর্তসাপেক্ষে আপনি এর "
+"পুনঃবিতরণ করতে পারেন: বিস্তারিত বিবরণের জন্য কপিং (COPYING) ফাইলটি পড়ুন ।\n"
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "অনুবাদক"
+
+#: 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:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr "ব্যবহার পদ্ধতি: chmod <mode> <file>\n"
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr "ব্যবহার পদ্ধতি: rename <old name> <new name>\n"
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr "ব্যবহার পদ্ধতি: delete <file>\n"
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr "ব্যবহার পদ্ধতি: rmdir <directory>\n"
+
+#: src/uicommon/gftpui.c:363
+#, fuzzy
+msgid "usage: site <site command>\n"
+msgstr "ব্যবহার পদ্ধতি: delete <file>\n"
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr "ব্যবহার পদ্ধতি: mkdir <new directory>\n"
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr "ব্যবহার পদ্ধতি: chdir <directory>\n"
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr "ত্রুটিপূর্ণ মান\n"
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr "ডিরেক্টরি ক্যাস পরিষ্কার করা হোক\n"
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr "ব্যবহার পদ্ধতি: set [variable = value]\n"
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr "ত্রুটি: ভেরিয়েবল %s সঠিক কনফিগারেশন ভেরিয়েবল নয়\n"
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr "ত্রুটি: ভেরিয়েবল %s জীএফটিপির টেকস্ট পোর্টে উপস্থিত নয়\n"
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+"সমর্থিত কম্যান্ডসমূহ:\n"
+"\n"
+
+#: src/uicommon/gftpui.c:852
+#, fuzzy, c-format
+msgid "usage: %s <filespec>\n"
+msgstr "ব্যবহার পদ্ধতি: mget <filespec>\n"
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr "সম্বন্ধে"
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr "জীএফটিপি সংক্রান্ত তথ্যাদি প্রদর্শন করে"
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr "অ্যাসকি"
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr "বর্তমান ফাইল স্থানান্তরকরণ অ্যাসকি মোডে হবে (একমাত্র এফ-টি-পির জন্যই)"
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr "বাইনারি"
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr "বর্তমান ফাইল স্থানান্তরকরণ বাইনারি মোডে হবে (একমাত্র এফ-টি-পির জন্যই)"
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr "সিডি"
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr "দূরবর্তী কার্যকর ডিরেক্টরি বদল করে"
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr "সিএইচডিআইআর"
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr "সিএইচমোড"
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr "দূরবর্তী ফাইলের অনুমতি পরিবর্তন করে"
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "পরিষ্কার"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr "উপস্থিত অপশনসমূহ: ক্যাস"
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr "ক্লোজ"
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr "দূরবর্তী সাইটের সংগে সংযোগ ছিন্ন করে"
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr "ডিলিট"
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr "একটি দূরবর্তী ফাইলকে মুছে ফেলে"
+
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "সিএইচডিআইআর"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "বর্তমান দূরবর্তী ডিরেক্টরির ডিরেক্টরি তালিকা দেখায়"
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr "গেট"
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr "দূরবর্তী ফাইল(সমূহ) ডাউনলোড করে"
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr "সাহায্য"
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr "এই সহায়ক পৃষ্ঠাটি দেখায়"
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr "এলসিডি"
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr "স্থানীয় কার্যকর ডিরেক্টরি বদল করে"
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr "এলসিএইচডিআইআর"
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr "এলসিএইচমোড"
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr "স্থানীয় ফাইলের অনুমতিমাত্রায় পরিবর্তন করে"
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr "এলডিলিট"
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr "একটি নির্দিষ্ট স্থানীয় ফাইলকে মুছে ফেলে"
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr "বর্তমান স্থানীয় ডিরেক্টরির ডিরেক্টরি তালিকা দেখায়"
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "এলএলএস"
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr "এলএমকডিআইআর"
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr "একটি স্থানীয় ডিরেক্টরি তৈরি করে"
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr "এলপিডাব্লুডি"
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr "বর্তমান স্থানীয় ডিরেক্টরিটি দেখায়"
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr "এলরিনেম"
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr "একটি স্থানীয় ফাইলের পুনঃনামাকরণ"
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr "এলাআরএমডিআইআর"
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr "একটি নির্দিষ্ট স্থানীয় ডিরেক্টরি মুছে ফেলে"
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr "এলএস"
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr "এমগেট"
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr "এমকেডিআইআর"
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr "একটি দূরবর্তী ডিরেক্টরি তৈরি করে"
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr "এমপুট"
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr "স্থানীয় ফাইল(সমূহ) আপলোড করে"
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr "খোলা হোক"
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr "দূরবর্তী সাইটের সংগে সংযোগ স্থাপন করে"
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr "পুট"
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr "পি-ডাব্লু-ডি"
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr "বর্তমান দূরবর্তী ডিরেক্টরির নামটি দেখায়"
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr "বিদায়"
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr "জীএফটিপি থেকে বিদায়"
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr "পুনঃনামাকরণ"
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr "দূরবর্তী ফাইলের পুনঃনামাকরণ করে"
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr "আরএমডিআইআর"
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr "দূরবর্তী ডিরেক্টরি মুছে ফেলে"
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr "বসানো"
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"কনফিগরেশন ফাইলের ভেরিয়েবল সমূহ দেখানো । আপনি চাইলে ভেরিয়েবলের মান এভাবেও "
+"বসাতে পারেন set var=val"
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+#, fuzzy
+msgid "Run a site specific command"
+msgstr "সাইট সংক্রান্ত কম্যান্ড এখানে লিখুন"
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr "ত্রুটি: অজ্ঞাত কম্যান্ড\n"
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "%s ফাইলটি %.2f কে-বি/সেক গতিতে স্থানান্তরকরণ সফল\n"
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "ফাইল %s এড়িযে যাওয়া হচ্ছে হোস্ত %s-য়ে\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "হোস্ট %s-য়ে স্থানান্তরকরণ থামানো হচ্ছে\n"
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "%s-কে %s থেকে ডাউনলোড করার প্রচেষ্টা ব্যর্থ\n"
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: অন্য কোন কিছু করার আগে থামানোর বাটনটি টিপুন\n"
 
-#: src/gtk/bookmarks.c:40
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "বুকমার্ক চালানো হোক"
 
-#: src/gtk/bookmarks.c:70
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "বুকমার্ক যোগ করা: বুকমার্কের নাম দেওয়া আবশ্যক\n"
 
-#: src/gtk/bookmarks.c:77
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "বুকমার্ক যোগ করা: %s নামের বুকমার্ক উপস্থিত থাকায়, ওই নামে যোগ করার চেষ্টা ব্যর্থ\n"
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "বুকমার্ক যোগ করা"
 
-#: src/gtk/bookmarks.c:141
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "বুকমার্ক যোগ করা: একটি হোস্টের নাম দেওয়া আবশ্যক\n"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1334,141 +1901,139 @@ msgstr ""
 "বিভিন্ন এন্ট্রির মধ্যে একটি / দিয়ে সাবমেনু তৈরি করা সম্ভব\n"
 "(উদাহরণ: লিনাক্স সংক্রান্ত/ডেবিয়ান)"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "পাসওয়ার্ড মনে রাখা হোক"
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "বুকমার্ক যোগ করা: বুকমার্কের নাম দেওয়া আবশ্যক\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "নতুন ফোল্ডার"
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "নতুন যে ফোল্ডারটি তৈরি হবে তার নাম লিখুন"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/ফাইল/নতুন বস্তু..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "নতুন যে বস্তুটি তৈরি হবে তার নাম লিখুন"
 
-#: src/gtk/bookmarks.c:555
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "আপনি কি সত্যিই সম্পূণ শাখা-প্রশাখা সহ বুকমার্ক\n"
 "%s কে মুছতে চান?"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "বুকমার্ক মুছে ফেলা হোক"
 
-#: src/gtk/bookmarks.c:583
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "বুকমার্কসমূহ"
 
-#: src/gtk/bookmarks.c:825 src/gtk/bookmarks.c:828
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "এন্ট্রি পরিবর্তন করা"
 
-#: src/gtk/bookmarks.c:865
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "বিবরণ:"
 
-#: src/gtk/bookmarks.c:880
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "হোস্টের নাম:"
 
-#: src/gtk/bookmarks.c:893
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "পোর্ট:"
 
-#: src/gtk/bookmarks.c:910
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "প্রোটোকল:"
 
-#: src/gtk/bookmarks.c:934
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "দূরবর্তী ডিরেক্টরি:"
 
-#: src/gtk/bookmarks.c:947
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "স্থানীয় ডিরেক্টরি:"
 
-#: src/gtk/bookmarks.c:964
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "পরিচয়:"
 
-#: src/gtk/bookmarks.c:977
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: src/gtk/bookmarks.c:991
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "অ্যাকাউন্ট:"
 
-#: src/gtk/bookmarks.c:1005
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "অ্যানোনিমাস হিসেবে লগিন করা হোক"
 
-#: src/gtk/bookmarks.c:1031 src/gtk/bookmarks.c:1266
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1117
-#: src/gtk/options_dialog.c:1319 src/gtk/transfer.c:2065
-msgid "  Cancel  "
-msgstr "  বাতিল করা  "
-
-#: src/gtk/bookmarks.c:1041 src/gtk/options_dialog.c:1330
-msgid "Apply"
-msgstr "প্রয়োগ কর"
-
-#: src/gtk/bookmarks.c:1183
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ফাইল (_ফ)"
 
-#: src/gtk/bookmarks.c:1184
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ফাইল/ছিড়ে ফেলা"
 
-#: src/gtk/bookmarks.c:1185
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/ফাইল/নতুন ফোল্ডার..."
 
-#: src/gtk/bookmarks.c:1186
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/ফাইল/নতুন বস্তু..."
 
-#: src/gtk/bookmarks.c:1187
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/ফাইল/মুছে ফেলা"
 
-#: src/gtk/bookmarks.c:1188
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/ফাইল/বৈশিষ্টাবলী..."
 
-#: src/gtk/bookmarks.c:1189
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ফাইল/"
 
-#: src/gtk/bookmarks.c:1190
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/ফাইল/"
 
-#: src/gtk/bookmarks.c:1201 src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "বুকমার্ক পরিবর্তন করা"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:89
-#: src/gtk/menu-items.c:422 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:540
-msgid "Operation canceled\n"
-msgstr "নির্দিষ্ট প্রক্রিয়া বাতিল\n"
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "অনুমতি পরিবর্তন (chmod)"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1476,76 +2041,90 @@ msgstr ""
 "আপনার পচ্ছন্দমত ফাইলের বৈশিষ্টাবলী বদলাতে পারেন\n"
 "মনে রাখবেন: সব এফ-টি-পি সার্ভারে এই সুবিধা থাকে না"
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "বিশেষ"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "এস-ইউ-আই-ডি"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "এস-জি-আই-ডি"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "স্টিকি"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:600
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "মালিক"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "পড়া"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "লেখা"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "চালানো"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:601
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "গ্রুপ"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "আপনি কি এই %ld ফাইল(সমূহ) এবং %ld ডিরেক্টরি(সমূহ) মুছে ফেলার ব্যপারে নিশ্চিত"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "আপনি কি এই %ld ফাইল(সমূহ) এবং %ld ডিরেক্টরি(সমূহ) মুছে ফেলার ব্যপারে নিশ্চিত"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "আপনি কি এই %ld ফাইল(সমূহ) এবং %ld ডিরেক্টরি(সমূহ) মুছে ফেলার ব্যপারে নিশ্চিত"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ফাইল/ডিরেক্টরি মুছে ফেলা"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1191
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "মুছে ফেল"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr "ড্রেগ-এন-ড্রপ"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "সংযোগস্থাপন করা হোক"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "ইউ-আর-এল গ্রহণ করা হয়েছে %s\n"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "ড্রেগ-এন-ড্রপ"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "বিদায়"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1553,451 +2132,577 @@ msgstr ""
 "বর্তমানে ফাইল স্থানান্তরিত করা হচ্ছে\n"
 "আপনি সত্যিই প্রোগ্রাম থেকে বিদায় নিতে চান?"
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "অপশনসমূহ"
+
+#: src/gtk/gftp-gtk.c:217
+#, fuzzy
+msgid "Enter a URL to connect to"
+msgstr "যে এফ-টি-পি ইউ-আর-এল-য়ের সংগে সংযোগস্থাপন করতে হবে তা লিখুন"
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/এফ-টি-পি (_ফ)"
 
-#: src/gtk/gftp-gtk.c:161
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/এফ-টি-পি/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/এফ-টি-পি/উইন্ডো ১"
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/এফ-টি-পি/উইন্ডো ২"
 
-#: src/gtk/gftp-gtk.c:164 src/gtk/gftp-gtk.c:167 src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/এফ-টি-পি/sep"
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/এফ-টি-পি/অ্যাসকি"
 
-#: src/gtk/gftp-gtk.c:166
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/এফ-টি-পি/বাইনারি"
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/_Options..."
-msgstr "/এফ-টি-পি/অপশন (_অ)..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/ফাইল/বৈশিষ্টাবলী..."
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/এফ-টি-পি/বিদায় (_ব)"
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/স্থানীয় (_থ)"
 
-#: src/gtk/gftp-gtk.c:173
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/স্থানীয়/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/স্থানীয়/অবস্থান (URL) খোলা হোক (_অ)..."
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/স্থানীয়/সংযোগ বিচ্ছিন্ন করা হোক"
 
-#: src/gtk/gftp-gtk.c:176 src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/স্থানীয়/sep"
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/স্থানীয়/ফাইলের ধরণ নির্দেশ বদল করা হোক..."
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/স্থানীয়/শুধু নির্বাচিতই দেখানো হোক"
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/স্থানীয়/সব নির্বাচন করা হোক"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/স্থানীয়/সব ফাইল নির্বাচন করা হোক"
 
-#: src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/স্থানীয়/নির্বাচন খারিজ করা হোক"
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/স্থানীয়/ডিরেক্টরি তালিকা সংরক্ষণ করা হোক..."
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/স্থানীয়/সাইট কম্যান্ড পাঠানো হোক..."
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/স্থানীয়/ডিরেক্টরি বদলানো হোক"
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/স্থানীয়/অনুমতি পরিবর্তন করা হোক..."
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Make Directory..."
-msgstr "/স্থানীয়/ডিরেক্টরি তৈরি করা হোক..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/ফাইল/নতুন ফোল্ডার..."
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/স্থানীয়/পুনঃনামাকরণ..."
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/স্থানীয়/মুছে ফেলা হোক..."
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/স্থানীয়/বদল করা হোক..."
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/স্থানীয়/প্রদর্শন..."
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/স্থানীয়/রিফ্রেশ"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/দূরবর্তী (_দ)"
 
-#: src/gtk/gftp-gtk.c:194
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/দূরবর্তী/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/দূরবর্তী/অবস্থান (URL) খোলা হোক (_অ)..."
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/দূরবর্তী/সংযোগ বিচ্ছিন্ন করা হোক"
 
-#: src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/দূরবর্তী/sep"
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/দূরবর্তী/ফাইলের ধরণ নির্দেশ বদল করা হোক..."
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/দূরবর্তী/শুধু নির্বাচিতই দেখানো হোক"
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/দূরবর্তী/সব নির্বাচন করা হোক"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/দূরবর্তী/সব ফাইল নির্বাচন করা হোক"
 
-#: src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/দূরবর্তী/নির্বাচন খারিজ করা হোক"
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/দূরবর্তী/ডিরেক্টরি তালিকা সংরক্ষণ করা হোক..."
 
-#: src/gtk/gftp-gtk.c:207
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/দূরবর্তী/সাইট কম্যান্ড পাঠানো হোক..."
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/দূরবর্তী/ডিরেক্টরি বদলানো হোক"
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/দূরবর্তী/অনুমতি পরিবর্তন করা হোক..."
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Make Directory..."
-msgstr "/দূরবর্তী/ডিরেক্টরি তৈরি করা হোক..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/ফাইল/নতুন ফোল্ডার..."
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/দূরবর্তী/পুনঃনামাকরণ..."
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/দূরবর্তী/মুছে ফেলা হোক..."
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/দূরবর্তী/বদল করা হোক..."
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/দূরবর্তী/প্রদর্শন..."
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/দূরবর্তী/রিফ্রেশ"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/বুকমার্ক (_ব)"
 
-#: src/gtk/gftp-gtk.c:217
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/বুকমার্ক/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/বুকমার্ক/বুকমার্ক যোগ করা হোক"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/বুকমার্ক/বুকমার্কে বদল করা হোক"
 
-#: src/gtk/gftp-gtk.c:221
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/বুকমার্ক/sep"
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/স্থানান্তর (_ফ)"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/স্থানান্তর/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Start Transfer"
-msgstr "/স্থানান্তর/স্থানান্তর করা হোক"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/স্থানান্তর/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/Stop Transfer"
-msgstr "/স্থানান্তর/স্থানান্তর থামানো হোক"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/স্থানান্তর/sep"
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:235
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/স্থানান্তর/sep"
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/স্থানান্তর/বর্তমান ফাইলটি বাদ দেওয়া হোক"
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/স্থানান্তর/ফাইল বাতিল করা হোক"
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/স্থানান্তর/ফাইল আগে নিয়ে যাওয়া হোক (_এ)"
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/স্থানান্তর/ফাইল পিছিয়ে আনা হোক (_প)"
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/স্থানান্তর/ফাইলসমূহ আনা হোক"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/স্থানান্তর/ফাইলসমূহ সার্ভারে তোলা হোক"
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/লগ করা (_ল)"
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/লগ করা/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/লগ করা/পরিষ্কার করা হোক"
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/View log..."
-msgstr "/লগ করা/লগ দেখা হোক..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/স্থানীয়/প্রদর্শন..."
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/লগ করা/লগ সংরক্ষণ করা হোক..."
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "যন্ত্রপাতি (_য)"
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "যন্ত্রপাতি/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "যন্ত্রপাতি/দু'টি উইন্ডোর মধ্যে তুলনা করা হোক"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "যন্ত্রপাতি/ক্যাস পরিষ্কার করা হোক"
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/সাহায্য (_স)"
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/সাহায্য/ছিড়ে ফেলা"
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/সাহায্য/সম্বন্ধে..."
 
-#: src/gtk/gftp-gtk.c:367
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "হোস্ট:"
 
-#: src/gtk/gftp-gtk.c:385
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "পোর্ট:"
 
-#: src/gtk/gftp-gtk.c:403
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "পরিচয়:"
 
-#: src/gtk/gftp-gtk.c:421
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "পাসওয়ার্ড:"
 
-#: src/gtk/gftp-gtk.c:598 src/gtk/gftp-gtk.c:802 src/gtk/transfer.c:1894
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ফাইলের নাম"
 
-#: src/gtk/gftp-gtk.c:599
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "আয়তন"
 
-#: src/gtk/gftp-gtk.c:602
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "তারিখ"
 
-#: src/gtk/gftp-gtk.c:603
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "বৈশিষ্টাবলী"
 
-#: src/gtk/gftp-gtk.c:803
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "অগ্রগতির মান"
 
-#: src/gtk/gftp-gtk.c:913 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
-msgid "Connect"
-msgstr "সংযোগস্থাপন করা হোক"
-
-#: src/gtk/gftp-gtk.c:935
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ত্রুটি: সংযোগ স্থাপনের জন্য একটি হোস্টের নাম এখানে আবশ্যিক\n"
 
-#: src/gtk/gftp-gtk.c:1170
-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";
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "রিফ্রেশ"
+
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "পরিচয়:"
+
+#: src/gtk/gtkui.c:121
+#, fuzzy
+msgid "Please enter your username for this site"
+msgstr "এই সাইটের জন্য আপনার পাসওয়ার্ডটি দিন এখানে"
+
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
+msgstr "এই সাইটের জন্য আপনার পাসওয়ার্ডটি দিন এখানে"
+
+#: src/gtk/gtkui.c:286
+#, fuzzy
+msgid "Operation canceled...you must enter a string\n"
+msgstr "সাইট: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
+
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
+msgstr "এমকেডিআইআর"
+
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
+msgstr "ডিরেক্টরি তৈরি করা"
+
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
+msgstr "যে ডিরেক্টরিটি তৈরি করতে চান সেটির নাম লিখুন"
+
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "পুনঃনামাকরণ"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
+msgstr "%s-য়ের নতুন নাম যা দিতে চান তা এখানে লিখুন?"
+
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
+msgstr "সাইট"
+
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
+msgstr "সাইট সংক্রান্ত কম্যান্ড এখানে লিখুন"
+
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
-">. এই প্রোগ্রামের বিষয়সংক্রান্ত আপনার যাবতীয় প্রশ্ন, মন্তব্য ও পরামর্শ যে কোন সময "
-"আমায় ইমেল করে পাঠাতে পারেন । জীএফটিপি সংক্রান্ত সর্বশেষ খবরাখবর আপনি আমার "
-"ওয়েবসাইট http://www.gftp.org-য়ে পাবেন\n"
 
-#: src/gtk/gftp-gtk.c:1172 src/text/gftp-text.c:150
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
+msgstr "সিএইচডিআইআর"
+
+#: 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:520 src/gtk/transfer.c:545
+msgid "Waiting..."
+msgstr "অপেক্ষা করা হচ্ছে..."
+
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "মুছে ফেলে লেখা হোক"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "পুনরারম্ভ করা হোক"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "এড়িয়ে যাওয়া হোক"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "নির্দিষ্ট কার্য"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
+msgstr "ফাইল স্থানান্তরকরণ"
+
+#: src/gtk/gtkui_transfer.c:242
 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"
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
-"জীএফটিপি কোন রকম নির্ভরযোগ্যতার আশ্বাস দেয় না; বিস্তারিত বিবরণের জন্য কপিং "
-"(COPYING) ফাইলটি পড়ুন ।  এটি একটি ফ্রী সফ্টওয়ের এবং কিছু শর্তসাপেক্ষে আপনি এর "
-"পুনঃবিতরণ করতে পারেন: বিস্তারিত বিবরণের জন্য কপিং (COPYING) ফাইলটি পড়ুন ।\n"
-
-#: src/gtk/menu-items.c:59 src/gtk/menu-items.c:89
-msgid "OpenURL"
-msgstr "ইউ-আর-এল_খোলার_নির্দেশ"
+"এই ফাইল(সমূহ) স্থানীয় এবং দূরবর্তী কন্প্যুটার দু'জায়গাই উপস্থিত রয়েছে\n"
+"এক্ষেত্রে আপনি কি করতে চান তা নির্দিষ্ট করুন"
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
 msgstr ""
-"ইউ-আর-এল_খোলার_নির্দেশ: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) "
-"দেওয়া আবশ্যক\n"
 
-#: src/gtk/menu-items.c:119
-msgid "Connect via URL"
-msgstr "ইউ-আর-এল দ্বারা সংযোগস্থাপন"
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr "ফাইল এড়িয়ে যাওয়া হোক"
 
-#: src/gtk/menu-items.c:119
-msgid "Enter ftp url to connect to"
-msgstr "যে এফ-টি-পি ইউ-আর-এল-য়ের সংগে সংযোগস্থাপন করতে হবে তা লিখুন"
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "সব নির্বাচন করা হোক"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr "নির্বাচন খারিজ করা হোক"
 
-#: src/gtk/menu-items.c:152
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "ফাইলের ধরণ নির্দেশ বদল: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) "
 "দেওয়া আবশ্যক\n"
 
-#: src/gtk/menu-items.c:189 src/gtk/menu-items.c:192
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "ফাইলের ধরণ নির্দেশ বদল করা"
 
-#: src/gtk/menu-items.c:192
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "নতুন ফাইলের ধরণ নির্দেশটি এখানে লিখুন"
 
-#: src/gtk/menu-items.c:220 src/gtk/menu-items.c:592 src/gtk/menu-items.c:650
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ত্রুটি: %s-কে লেখার জন্য খোলার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: src/gtk/menu-items.c:246
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ডিরেক্টরি দর্শন তালিকা সংরক্ষণ করা"
 
-#: src/gtk/menu-items.c:363
-msgid "SITE: Operation canceled...you must enter a string\n"
-msgstr "সাইট: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
-
-#: src/gtk/menu-items.c:382 src/gtk/menu-items.c:385
-msgid "Site"
-msgstr "সাইট"
-
-#: src/gtk/menu-items.c:385
-msgid "Enter site-specific command"
-msgstr "সাইট সংক্রান্ত কম্যান্ড এখানে লিখুন"
-
-#: src/gtk/menu-items.c:484 src/gtk/menu-items.c:518
-msgid "Chdir"
-msgstr "সিএইচডিআইআর"
-
-#: src/gtk/menu-items.c:616 src/gtk/menu-items.c:674
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ত্রুটি: %s-য়ে লেখার চেষ্টায়ে ত্রুটি: %s\n"
 
-#: src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "লগ ফাইল %s-য়ে লেখার প্রচেষ্টা সফল\n"
 
-#: src/gtk/menu-items.c:697
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "লগ সংরক্ষণ করা"
 
-#: src/gtk/menu-items.c:733
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2006,118 +2711,95 @@ msgstr ""
 "লাইসেন্স চুক্তির ফাইল -- কপিং (COPYING) খুঁজে পাওয়া যাচ্ছে না । দয়া করে নিশ্চিত "
 "করুনযেন এটি হয় %s বা %s-য়ে থাকে"
 
-#: src/gtk/menu-items.c:737 src/gtk/menu-items.c:742
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "জীএফটিপি সম্বন্ধে"
 
-#: src/gtk/menu-items.c:773
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "কপিরাইট © ১৯৯৮ - ২০০২ ব্র্যায়ান ম্যাসনি <masneyb gftp org>\n"
 "নিজস্ব হোমপেজ:  http://www.gftp.org/\n";
 "প্রতীক তৈরি করেছেন: আরন ওরলি <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:774 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "অনুবাদক"
-
-#: src/gtk/menu-items.c:785
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "সম্বন্ধে"
 
-#: src/gtk/menu-items.c:834
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "লাইসেন্স চুক্তি"
 
-#: src/gtk/menu-items.c:840 src/gtk/view_dialog.c:377
-msgid "  Close  "
-msgstr "  বন্ধ করা হোক  "
-
-#: src/gtk/menu-items.c:922
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "দু'ই উইন্ডোর মধ্যে তুলনা"
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "রিফ্রেশ"
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "দূরবর্তী সাইটের সংগে সংযোগ ছিন্ন করে"
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "সমস্ত ফাইল"
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (ক্যাস করা) ["
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "সংযোগ নেই"
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ফাইল %s খোলার সময় ত্রুটি: %s\n"
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: কোন দূরবর্তী সাইটের সংগে বর্তমানে সংযোগ নেই\n"
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: এই প্রোটোকল ব্যবহারকালীন এই বৈশিষ্টটি উপস্থিত নয়\n"
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: শুধুমাত্র একটিই বস্তু নির্বাচিত থাকতে পারে\n"
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: অন্ততত পক্ষে একটি বস্তুর নির্বাচিত থাকা আবশ্যক\n"
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "পরিবর্তন করা হোক"
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "পুনঃনামাকরণ"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1177
-msgid "Add"
-msgstr "যোগ কর"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "বাতিল কর"
-
-#: src/gtk/misc-gtk.c:1053
-msgid "  Yes  "
-msgstr "  হ্যা  "
-
-#: src/gtk/misc-gtk.c:1063
-msgid "  No  "
-msgstr "  না  "
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ডিরেক্টরি তালিকা উঠিয়ে আনা হচ্ছে"
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  থামো  "
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2126,142 +2808,92 @@ msgstr ""
 "%ld ডিরেক্টরি পাওয়া গেছে\n"
 "এবং %ld ফাইল"
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "জীএফটিপি ত্রুটি: ফাইল %s-কে %s বা %s খুঁজে পাওয়া যায়নি\n"
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
-msgstr "Mkdir: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
-
-#: src/gtk/mkdir_dialog.c:100
-msgid "Mkdir"
-msgstr "এমকেডিআইআর"
-
-#: src/gtk/mkdir_dialog.c:104
-msgid "Make Directory"
-msgstr "ডিরেক্টরি তৈরি করা"
-
-#: src/gtk/mkdir_dialog.c:104
-msgid "Enter name of directory to create"
-msgstr "যে ডিরেক্টরিটি তৈরি করতে চান সেটির নাম লিখুন"
-
-#: src/gtk/options_dialog.c:917
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "হোস্টে পরিবর্তন করা"
 
-#: src/gtk/options_dialog.c:917
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "হোস্ট যোগ করা"
 
-#: src/gtk/options_dialog.c:949 src/gtk/options_dialog.c:1040
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ডোমেইন"
 
-#: src/gtk/options_dialog.c:969
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "নেটওয়ার্ক অবস্থান"
 
-#: src/gtk/options_dialog.c:1002 src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "নেটমাস্ক"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "ডোমেইন"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "নেটমাস্ক"
 
-#: src/gtk/options_dialog.c:1148
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "স্থানীয় হোস্ট"
 
-#: src/gtk/options_dialog.c:1184 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "বদল কর"
-
-#: src/gtk/options_dialog.c:1246 src/gtk/options_dialog.c:1251
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "অপশনসমূহ"
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-"পুনঃনামাকরণ: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
-
-#: src/gtk/rename_dialog.c:111
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr "%s-য়ের নতুন নাম যা দিতে চান তা এখানে লিখুন?"
-
-#: src/gtk/transfer.c:173
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ফাইলসমূহের নাম আসছে..."
 
-#: src/gtk/transfer.c:289
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "%d সেকেন্ড অপেক্ষা করা হচ্ছে আবার সংযোগের প্রচেষ্টা করার আগে\n"
-
-#: src/gtk/transfer.c:316 src/gtk/transfer.c:1292
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "সংযোগের চেষ্টা করা হচ্ছে..."
 
-#: src/gtk/transfer.c:326 src/gtk/transfer.c:1186 src/gtk/transfer.c:1197
-msgid "Enter Password"
-msgstr "আপনার পাসওয়ার্ড দিন"
-
-#: src/gtk/transfer.c:327 src/gtk/transfer.c:1187 src/gtk/transfer.c:1198
-msgid "Please enter your password for this site"
-msgstr "এই সাইটের জন্য আপনার পাসওয়ার্ডটি দিন এখানে"
-
-#: src/gtk/transfer.c:417
-msgid "Transfer Files"
-msgstr "ফাইল স্থানান্তরকরণ"
-
-#: src/gtk/transfer.c:425
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ফাইলসমূহ আনা: দূরবর্তী সাইটের সংগে কোন সংযোগ নেই\n"
 
-#: src/gtk/transfer.c:652
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "ত্রুটি: দূরবর্তী সাইট স্থানান্তর করার প্রচেষ্টায় ব্যর্থ হয়ে সংযোগ ছিন্ন করেছে\n"
-
-#: src/gtk/transfer.c:709
-#, c-format
-msgid "Could not download %s from %s\n"
-msgstr "%s-কে %s থেকে ডাউনলোড করার প্রচেষ্টা ব্যর্থ\n"
-
-#: src/gtk/transfer.c:739
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "%s ফাইলটি %.2f কে-বি/সেক গতিতে স্থানান্তরকরণ সফল\n"
-
-#: src/gtk/transfer.c:844 src/gtk/transfer.c:1078 src/gtk/transfer.c:1164
-#: src/gtk/transfer.c:1607
-msgid "Skipped"
-msgstr "এড়িয়ে যাওয়া হয়েছে"
-
-#: src/gtk/transfer.c:848 src/gtk/transfer.c:1140 src/gtk/transfer.c:1168
-msgid "Waiting..."
-msgstr "অপেক্ষা করা হচ্ছে..."
-
-#: src/gtk/transfer.c:991
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ত্রুটি: চাইল্ড %d ফেরত মান %d\n"
 
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "চাইল্ড %d ফেরত মান সফল\n"
 
-#: src/gtk/transfer.c:1001
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "ত্রুটি: চাইল্ড %d ফেরত মান %d\n"
+
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ত্রুটি: ফাইল %s-য়ের সংক্রান্ত তথ্য আনার প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: src/gtk/transfer.c:1006
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ফাইল %s-য়ে কোন পরিবর্তন হয়নি\n"
 
-#: src/gtk/transfer.c:1014
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2270,489 +2902,281 @@ msgstr ""
 "ফাইল %s-য়ে পরিবর্তন ঘটেছে\n"
 "আপনি কি এটিকে আপলোড করতে চান?"
 
-#: src/gtk/transfer.c:1017
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ফাইলে রদবদল করা"
 
-#: src/gtk/transfer.c:1081
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "কাজটি সম্পূর্ণ হয়েছে"
 
-#: src/gtk/transfer.c:1121
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "ফাইল %s-এর স্থানান্তর থামানো হচ্ছে\n"
-
-#: src/gtk/transfer.c:1336
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% সম্পূর্ণ, %02d:%02d:%02d সময় লাগবে অনুমান (ফাইল %ld এর %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr ""
+"সম্পূর্ণ হয়েছে %s-বাইট মোট %s, %.2fকে-বি/সেক গতি, %02d:%02d:%02d সময় লাগার অনুমান"
 
-#: src/gtk/transfer.c:1366
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "সম্পূর্ণ হয়েছে %s-বাইট মোট %s, %.2fকে-বি/সেক গতি, %02d:%02d:%02d সময় লাগার অনুমান"
 
-#: src/gtk/transfer.c:1375
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "সম্পূর্ণ হয়েছে %s-বাইট মোট %s: স্থানান্তরকরণ থমকে গেছে, সমাপ্তির সময় অজ্ঞাত"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "সম্পূর্ণ হয়েছে %s-বাইট মোট %s: স্থানান্তরকরণ থমকে গেছে, সমাপ্তির সময় অজ্ঞাত"
 
-#: src/gtk/transfer.c:1401
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr "সব ফাইলের নাম আনা হচ্ছে...%s বাইট"
-
-#: src/gtk/transfer.c:1479 src/gtk/transfer.c:1501 src/gtk/transfer.c:1535
-#: src/gtk/transfer.c:1575 src/gtk/transfer.c:1628 src/gtk/transfer.c:1687
-msgid "There are no file transfers selected\n"
-msgstr "কোন ফাইল স্থানান্তরকরণ নির্বাচিত নয়\n"
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
 
-#: src/gtk/transfer.c:1519
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "হোস্ট %s-য়ে স্থানান্তরকরণ থামানো হচ্ছে\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr "%d%% সম্পূর্ণ, %02d:%02d:%02d সময় লাগবে অনুমান (ফাইল %ld এর %ld)"
 
-#: src/gtk/transfer.c:1560 src/gtk/transfer.c:1613
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "ফাইল %s এড়িযে যাওয়া হচ্ছে হোস্ত %s-য়ে\n"
-
-#: src/gtk/transfer.c:1774 src/gtk/transfer.c:1979 src/gtk/transfer.c:2018
-msgid "Overwrite"
-msgstr "মুছে ফেলে লেখা হোক"
-
-#: src/gtk/transfer.c:1796 src/gtk/transfer.c:1989 src/gtk/transfer.c:2024
-msgid "Resume"
-msgstr "পুনরারম্ভ করা হোক"
-
-#: src/gtk/transfer.c:1818 src/gtk/transfer.c:1984
-msgid "Skip"
-msgstr "এড়িয়ে যাওয়া হোক"
-
-#: src/gtk/transfer.c:1895
-msgid "Local Size"
-msgstr "স্থানীয় আয়তন"
-
-#: src/gtk/transfer.c:1896
-msgid "Remote Size"
-msgstr "দূরবর্তী আয়তন"
-
-#: src/gtk/transfer.c:1897
-msgid "Action"
-msgstr "নির্দিষ্ট কার্য"
-
-#: src/gtk/transfer.c:1899
-msgid "Download Files"
-msgstr "ফাইলসমূহ ডাউনলোড করা"
-
-#: src/gtk/transfer.c:1899
-msgid "Upload Files"
-msgstr "ফাইলসমূহ আপলোড করা"
-
-#: src/gtk/transfer.c:1925
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-"এই ফাইল(সমূহ) স্থানীয় এবং দূরবর্তী কন্প্যুটার দু'জায়গাই উপস্থিত রয়েছে\n"
-"এক্ষেত্রে আপনি কি করতে চান তা নির্দিষ্ট করুন"
-
-#: src/gtk/transfer.c:2030
-msgid "Skip File"
-msgstr "ফাইল এড়িয়ে যাওয়া হোক"
-
-#: src/gtk/transfer.c:2040
-msgid "Select All"
-msgstr "সব নির্বাচন করা হোক"
+msgid "Retrieving file names...%s bytes"
+msgstr "সব ফাইলের নাম আনা হচ্ছে...%s বাইট"
 
-#: src/gtk/transfer.c:2046
-msgid "Deselect All"
-msgstr "নির্বাচন খারিজ করা হোক"
+#: 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"
 
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "প্রদর্শন"
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "বদল কর"
+
+#: 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:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "ফাইলে পরিবর্তন: অপশনসমূহের ডিয়লগে একটি এডিটর প্রোগ্রামের নাম দেওয়া আবশ্যক\n"
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "ফাইলে পরিবর্তন: %s একটি ডিরেক্টরি । কোন পরিবর্তন (edit) করা সম্ভব নয়\n"
 
-#: src/gtk/view_dialog.c:184
+#: 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 "প্রদর্শন: অন্য একটি প্রসেস ফর্ক (fork) করা প্রচেষ্টা ব্যর্থ: %s\n"
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "প্রোগ্রাম চালানো হচ্ছে: %s %s\n"
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s-কে %s-য়ের সাহায্যে খোলা হচ্ছে\n"
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ফাইল %s দেখা হচ্ছে\n"
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "প্রদর্শন: ফাইল %s খোলার চেষ্টা ব্যর্থ: %s\n"
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr "সম্বন্ধে"
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr "জীএফটিপি সংক্রান্ত তথ্যাদি প্রদর্শন করে"
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr "অ্যাসকি"
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr "বর্তমান ফাইল স্থানান্তরকরণ অ্যাসকি মোডে হবে (একমাত্র এফ-টি-পির জন্যই)"
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr "বাইনারি"
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr "বর্তমান ফাইল স্থানান্তরকরণ বাইনারি মোডে হবে (একমাত্র এফ-টি-পির জন্যই)"
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr "সিডি"
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr "দূরবর্তী কার্যকর ডিরেক্টরি বদল করে"
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr "সিএইচডিআইআর"
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr "সিএইচমোড"
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr "দূরবর্তী ফাইলের অনুমতি পরিবর্তন করে"
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr "পরিষ্কার"
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr "উপস্থিত অপশনসমূহ: ক্যাস"
-
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr "ক্লোজ"
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr "দূরবর্তী সাইটের সংগে সংযোগ ছিন্ন করে"
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr "ডিলিট"
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr "একটি দূরবর্তী ফাইলকে মুছে ফেলে"
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr "গেট"
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr "দূরবর্তী ফাইল(সমূহ) ডাউনলোড করে"
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr "সাহায্য"
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr "এই সহায়ক পৃষ্ঠাটি দেখায়"
+#: src/text/gftp-text.c:166
+#, c-format
+msgid "Cannot open controlling terminal %s\n"
+msgstr "নিয়ন্ত্রক টারমিনাল %s খোলার প্রচেষ্টা ব্যর্থ\n"
 
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr "এলসিডি"
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "পরিচয়:"
 
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr "স্থানীয় কার্যকর ডিরেক্টরি বদল করে"
+#: src/text/textui.c:158
+#, c-format
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+msgstr ""
 
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr "এলসিএইচডিআইআর"
+#~ msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "ব্যবহার পদ্ধতি: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
 
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr "এলসিএইচমোড"
+#~ msgid "Startup Directory:"
+#~ msgstr "শুরু হবার ডিরেক্টরি:"
 
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr "স্থানীয় ফাইলের অনুমতিমাত্রায় পরিবর্তন করে"
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "জীএফটিপি চালু হবার পরেই যে ডিরেক্টরিতে যাবে"
 
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr "এলডিলিট"
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "ফাইল স্থানান্তর করা শুরু হচ্ছে অফসেট %lld থেকে\n"
 
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr "একটি নির্দিষ্ট স্থানীয় ফাইলকে মুছে ফেলে"
+#~ msgid "Received invalid response to PWD command: '%s'\n"
+#~ msgstr "পি-ডাব্লু-ডি কম্যান্ডের বেঠিক উত্তর পাওয়া গেছে: '%s'\n"
 
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr "এলএলএস"
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "এসএসএইচ২ এসএফটিপি সার্ভার পাথ"
 
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr "বর্তমান স্থানীয় ডিরেক্টরির ডিরেক্টরি তালিকা দেখায়"
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "ডিফল্ত দূরব্র্তী এসএসএইচ২ এসএফটিপি সার্ভার পাথ"
 
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr "এলএমকডিআইআর"
+#~ msgid "Use ssh-askpass utility"
+#~ msgstr "এসএসএইচ আস্কপাস ব্যবহার করা হোক"
 
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr "একটি স্থানীয় ডিরেক্টরি তৈরি করে"
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "এসএসএইচ আস্কপাস ব্যবহার করা হোক দূরবর্তী পাসওয়ার্ডটি দেওয়ার জন্য"
 
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr "এলপিডাব্লুডি"
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "এসএসএইচ২ এসএফটিপি ব্যবস্থা ব্যবহার করা হোক"
 
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr "বর্তমান স্থানীয় ডিরেক্টরিটি দেখায়"
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "এসএসএইচ-কে -s এসএফটিপি ফ্লাগ সমেত ডাকা । এটি ব্যবহারের সুবিধা এই যে দূরবর্তী "
+#~ "এসএফটিপি সার্ভারের দূরবর্তী পাথ আপনার জানার কোন প্রয়োজন নেই"
 
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr "এলরিনেম"
+#~ msgid "WARNING"
+#~ msgstr "**সাবধান**"
 
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr "একটি স্থানীয় ফাইলের পুনঃনামাকরণ"
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "কম্যান্ড লাইন এসএসএইচ ব্যবহার করে এই হোস্টের সংগে সংযোগ করে এই প্রশ্নের যথাযথ "
+#~ "উত্তর দিন\n"
 
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr "এলাআরএমডিআইআর"
+#~ msgid "Please correct the above warning to connect to this host.\n"
+#~ msgstr "এই হোস্টের সংগে সংযোগ স্থাপনের জন্য উপরোক্ত সর্তকবার্তার কারণটি ঠিক করুন\n"
 
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr "একটি নির্দিষ্ট স্থানীয় ডিরেক্টরি মুছে ফেলে"
+#~ msgid "  Cancel  "
+#~ msgstr "  বাতিল করা  "
 
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr "এলএস"
+#~ msgid "Apply"
+#~ msgstr "প্রয়োগ কর"
 
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr "বর্তমান দূরবর্তী ডিরেক্টরির ডিরেক্টরি তালিকা দেখায়"
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/এফ-টি-পি/অপশন (_অ)..."
 
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr "এমগেট"
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/স্থানীয়/ডিরেক্টরি তৈরি করা হোক..."
 
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr "এমকেডিআইআর"
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/দূরবর্তী/ডিরেক্টরি তৈরি করা হোক..."
 
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr "একটি দূরবর্তী ডিরেক্টরি তৈরি করে"
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/স্থানান্তর/স্থানান্তর করা হোক"
 
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr "এমপুট"
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/স্থানান্তর/স্থানান্তর থামানো হোক"
 
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr "স্থানীয় ফাইল(সমূহ) আপলোড করে"
+#~ msgid "/Logging/View log..."
+#~ msgstr "/লগ করা/লগ দেখা হোক..."
 
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr "খোলা হোক"
+#~ 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-য়ে পাবেন\n"
 
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr "দূরবর্তী সাইটের সংগে সংযোগ স্থাপন করে"
+#~ msgid "OpenURL"
+#~ msgstr "ইউ-আর-এল_খোলার_নির্দেশ"
 
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr "পুট"
+#~ msgid "OpenURL: Operation canceled...you must enter a string\n"
+#~ msgstr ""
+#~ "ইউ-আর-এল_খোলার_নির্দেশ: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) "
+#~ "দেওয়া আবশ্যক\n"
 
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr "পি-ডাব্লু-ডি"
+#~ msgid "Connect via URL"
+#~ msgstr "ইউ-আর-এল দ্বারা সংযোগস্থাপন"
 
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr "বর্তমান দূরবর্তী ডিরেক্টরির নামটি দেখায়"
+#~ msgid "  Close  "
+#~ msgstr "  বন্ধ করা হোক  "
 
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr "বিদায়"
+#~ msgid "Add"
+#~ msgstr "যোগ কর"
 
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr "জীএফটিপি থেকে বিদায়"
+#~ msgid "Cancel"
+#~ msgstr "বাতিল কর"
 
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr "পুনঃনামাকরণ"
+#~ msgid "  Yes  "
+#~ msgstr "  হ্যা  "
 
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr "দূরবর্তী ফাইলের পুনঃনামাকরণ করে"
+#~ msgid "  No  "
+#~ msgstr "  না  "
 
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr "আরএমডিআইআর"
+#~ msgid "Mkdir: Operation canceled...you must enter a string\n"
+#~ msgstr ""
+#~ "Mkdir: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
 
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr "দূরবর্তী ডিরেক্টরি মুছে ফেলে"
+#~ msgid "Rename: Operation canceled...you must enter a string\n"
+#~ msgstr ""
+#~ "পুনঃনামাকরণ: নির্দিষ্ট প্রক্রিয়া বাতিল...এখানে একটি পংক্তি (স্ট্রিং) দেওয়া আবশ্যক\n"
 
-#: src/text/gftp-text.c:89
-msgid "set"
-msgstr "বসানো"
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "ত্রুটি: দূরবর্তী সাইট স্থানান্তর করার প্রচেষ্টায় ব্যর্থ হয়ে সংযোগ ছিন্ন করেছে\n"
 
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-"কনফিগরেশন ফাইলের ভেরিয়েবল সমূহ দেখানো । আপনি চাইলে ভেরিয়েবলের মান এভাবেও "
-"বসাতে পারেন set var=val"
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "ফাইল %s-এর স্থানান্তর থামানো হচ্ছে\n"
 
-#: src/text/gftp-text.c:148
-msgid ""
-">.\n"
-"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 ""
-">.\n"
-"এই প্রোগ্রামের বিষয়সংক্রান্ত আপনার যাবতীয় প্রশ্ন, মন্তব্য ও পরামর্শ যে কোন সময আমায় "
-"ইমেল করে পাঠাতে পারেন । জীএফটিপি সংক্রান্ত সর্বশেষ খবরাখবর আপনি আমার ওয়েবসাইট "
-"http://www.gftp.org-য়ে পাবেন\n"
+#~ msgid "Local Size"
+#~ msgstr "স্থানীয় আয়তন"
 
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr "ত্রুটি: অজ্ঞাত কম্যান্ড\n"
+#~ msgid "Remote Size"
+#~ msgstr "দূরবর্তী আয়তন"
 
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-"ব্যবহার পদ্ধতি:  open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
+#~ msgid "Download Files"
+#~ msgstr "ফাইলসমূহ ডাউনলোড করা"
 
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:699
-#: src/text/gftp-text.c:717 src/text/gftp-text.c:738 src/text/gftp-text.c:812
-msgid "Error: Not connected to a remote site\n"
-msgstr "ত্রুটি: দূরবর্তী সাইটের সংগে কোন সংযোগ নেই\n"
+#~ msgid "Upload Files"
+#~ msgstr "ফাইলসমূহ আপলোড করা"
 
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr "ব্যবহার পদ্ধতি: chdir <directory>\n"
+#~ msgid ""
+#~ ">.\n"
+#~ "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 ""
+#~ ">.\n"
+#~ "এই প্রোগ্রামের বিষয়সংক্রান্ত আপনার যাবতীয় প্রশ্ন, মন্তব্য ও পরামর্শ যে কোন সময "
+#~ "আমায় ইমেল করে পাঠাতে পারেন । জীএফটিপি সংক্রান্ত সর্বশেষ খবরাখবর আপনি আমার "
+#~ "ওয়েবসাইট http://www.gftp.org-য়ে পাবেন\n"
 
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr "ব্যবহার পদ্ধতি: mkdir <new directory>\n"
+#~ msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "ব্যবহার পদ্ধতি:  open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
 
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr "ব্যবহার পদ্ধতি: rmdir <directory>\n"
+#~ msgid "usage: mput <filespec>\n"
+#~ msgstr "ব্যবহার পদ্ধতি: mput <filespec>\n"
 
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr "ব্যবহার পদ্ধতি: delete <file>\n"
-
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr "ব্যবহার পদ্ধতি: rename <old name> <new name>\n"
-
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr "ব্যবহার পদ্ধতি: chmod <mode> <file>\n"
+#~ msgid "Could not download %s\n"
+#~ msgstr "%s ডাউনলোডের প্রচেষ্টা ব্যর্থ\n"
 
-#: src/text/gftp-text.c:745
-msgid "usage: mget <filespec>\n"
-msgstr "ব্যবহার পদ্ধতি: mget <filespec>\n"
-
-#: src/text/gftp-text.c:819
-msgid "usage: mput <filespec>\n"
-msgstr "ব্যবহার পদ্ধতি: mput <filespec>\n"
-
-#: src/text/gftp-text.c:957
-#, c-format
-msgid "Could not download %s\n"
-msgstr "%s ডাউনলোডের প্রচেষ্টা ব্যর্থ\n"
-
-#: src/text/gftp-text.c:964
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr "%s স্থানাতর প্রচেষ্টা সফল\n"
-
-#: src/text/gftp-text.c:1031
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-"সমর্থিত কম্যান্ডসমূহ:\n"
-"\n"
-
-#: src/text/gftp-text.c:1087
-msgid "usage: set [variable = value]\n"
-msgstr "ব্যবহার পদ্ধতি: set [variable = value]\n"
-
-#: src/text/gftp-text.c:1101
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr "ত্রুটি: ভেরিয়েবল %s সঠিক কনফিগারেশন ভেরিয়েবল নয়\n"
-
-#: src/text/gftp-text.c:1108
-#, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr "ত্রুটি: ভেরিয়েবল %s জীএফটিপির টেকস্ট পোর্টে উপস্থিত নয়\n"
-
-#: src/text/gftp-text.c:1136
-msgid "Invalid argument\n"
-msgstr "ত্রুটিপূর্ণ মান\n"
-
-#: src/text/gftp-text.c:1161
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr "নিয়ন্ত্রক টারমিনাল %s খোলার প্রচেষ্টা ব্যর্থ\n"
-
-#: src/text/gftp-text.c:1239
-msgid "Clear the directory cache\n"
-msgstr "ডিরেক্টরি ক্যাস পরিষ্কার করা হোক\n"
+#~ msgid "Successfully transferred %s\n"
+#~ msgstr "%s স্থানাতর প্রচেষ্টা সফল\n"
 
 #~ msgid "Finished retrieving data\n"
 #~ msgstr "ডাটা তুলে আনা শেষ হয়েছে\n"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 03b8827..1721629 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,99 +7,100 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-08-21 19:58+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-10-21 14:37+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab redhat com>\n"
 "Language-Team: Bengali INDIA <anubad lists ankur org in>\n"
+"Language: bn_IN\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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "অবৈধ URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ত্রুটি: ক্যাশে ইন্ডেক্স ফাইলের মধ্যে অবৈধ পংক্তি %s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 ফাইলের মধ্যে seek (অনুসন্ধান) করতে ব্যর্থ: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr ""
-"'%s' পংক্তিটিকে %s ক্যারেক্টার সেট থেকে %s ক্যারেক্টার সেটে রূপান্তর করতে সমস্যা: %"
-"s\n"
+"'%s' পংক্তিটিকে %s ক্যারেক্টার সেট থেকে %s ক্যারেক্টার সেটে রূপান্তর করতে সমস্যা: "
+"%s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ত্রুটি: স্থানীয় ফাইল %s খুলতে ব্যর্থ: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ত্রুটি: সকেটে লিখতে ব্যর্থ: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ত্রুটি: সকেট থেকে পড়তে ব্যর্থ: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "সতর্কবার্তা: প্রধান বুকমার্ক ফাইল %s পাওয়া যায়নি\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP সতর্কবার্তা: বুকমার্ক ফাইলের %d পংক্তিটি উপেক্ষা করা হবে: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP সতর্কবার্তা: %d পংক্তির মধ্যে পর্যাপ্ত আর্গুমেন্ট উপস্থিত নেই\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -110,7 +111,7 @@ msgstr ""
 "হবে না। সিনটেক্স: dont_use_proxy=.domain অথবা dont_use_proxy=network number/"
 "netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -118,52 +119,52 @@ msgstr ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. "
 "উল্লেখ্য: ফাইলের এক্সটেনশন ব্যতীত অন্যান্য কোনো আর্গুমেন্ট উল্লেখ করা বাধ্যতামূলক নয়"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "make install প্রয়োগ করা হয়েছে কি?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP-র ত্রুটি: লগ ফাইলের নাম %s সঠিক নয়\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -171,7 +172,7 @@ msgstr ""
 "gFTP-র জন্য বুকমার্ক ফাইল। স্বত্বাধিকার (C) ১৯৯৮-২০০৭ ব্রায়েন মেসনি <masneyb gftp "
 "org>। সতর্কবার্তা: এই ফাইলে সংযুক্ত সকল অতিরিক্ত মন্তব্য মুছে ফেলা হবে"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -183,7 +184,7 @@ msgstr ""
 "আপনার লেখা পাসওয়ার্ড সহজে মনে রাখার সম্ভাবনা এড়ানোর জন্য এই পদ্ধতি প্রয়োগ করা হয়। "
 "পূর্বে সকল পাসওয়ার্ড প্লেইন-টেক্সটে সংরক্ষণ করা হত।"
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -193,94 +194,94 @@ msgstr ""
 "org>। সতর্কবার্তা: এই ফাইলে সংযুক্ত সকল অতিরিক্ত মন্তব্য মুছে ফেলা হবে। কোনো এনট্রির "
 "ক্ষেত্রে (*) চিহ্ন ব্যবহার করা হলে gFTP-র মধ্যে এটি পরিবর্তন করা যাবে না"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
+msgstr ""
+"gFTP-র গুরুতর ত্রুটি: গ্লোবাল হ্যাশ টেবিলের মধ্যে '%s' কনফিগ বিকল্পটি পাওয়া যায়নি\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ত্রুটি: ফাইল %s আপলোড করতে ব্যর্থ\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ত্রুটি: %s ফাইলে লিখতে ব্যর্থ: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ত্রুটি: ফাইল বন্ধ করতে ব্যর্থ: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP সার্ভার %s থেকে ক্ষতিগ্রস্ত ফাইলের তালিকা প্রাপ্ত হয়েছে\n"
 
-#: ../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
+#: 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 "অজানা"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP ডিরেক্টরির তালিকা %s পাওয়া যায়নি: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "সাফল্যের সাথে %s ডিরেক্টরিতে পরিবর্তন করা হয়েছে\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "%s ডিরেক্টরিতে পরিবর্তন করতে ব্যর্থ\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "সাফল্যের সাথে %s অপসারণ করা হয়েছে\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ত্রুটি: %s ফাইল মুছে ফেলতে ব্যর্থ: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -288,7 +289,7 @@ msgstr ""
 "SSL সমর্থন ব্যবস্থা কম্পাইল না করার ফলে FTPS সমর্থন উপলব্ধ নেই। সংযোগ পরিত্যাগ করা "
 "হচ্ছে।\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -296,107 +297,105 @@ msgstr ""
 "SSL সমর্থন ব্যবস্থা কম্পাইল না করার ফলে HTTPS সমর্থন উপলব্ধ নেই। সংযোগ পরিত্যাগ করা "
 "হচ্ছে।\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "বর্তমানে ব্যবহৃত ডিরেক্টরি পাওয়া যায়নি: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "সাফল্যের সাথে %s ডিরেক্টরিকে স্থানীয় ডিরেক্টরিরূপে পরিবর্তন করা হয়েছে\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "স্থানীয় ডিরেক্টরি রূপে %s-এ পরিবর্তন করা যায়নি: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ত্রুটি: স্থানীয় ফাইল %s-র মাপ কম করা যায়নি: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "স্থানীয় ডিরেক্টরির তালিকা %s পাওয়া যায়নি: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s-র মোড সাফল্যের সাথে %o-এ পরিবর্তন করা হয়েছে\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ত্রুটি: %s-র মোড %o-এ পরিবর্তন করতে ব্যর্থ: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s-র সময়ের-চিহ্ন সাফল্যের সাথে পরিবর্তন করা হয়েছে\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ত্রুটি: %s-র সময়ের চিহ্ন পরিবর্তন করতে ব্যর্থ: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "স্থানীয় ফাইল-সিস্টেম"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ব্যবহারপ্রণালী: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "শূণ্য"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ফাইল"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "মাপ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ব্যবহারকারী"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "দল"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "তারিখ ও সময়"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "বৈশিষ্ট্য"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "বড় থেকে ছোট"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ছোট থেকে বড়"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "প্রোগ্রাম প্রদর্শন:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -404,27 +403,27 @@ msgstr ""
 "ফাইল প্রদর্শনের জন্য ব্যবহৃত ডিফল্ট প্রোগ্রাম। কোনো প্রোগ্রাম চিহ্নিত না করা হলে, "
 "অভ্যন্তরীণ ফাইল প্রদর্শন ব্যবস্থা ব্যবহার করা হবে।"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "সম্পাদনার প্রোগ্রাম:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ফাইল সম্পাদনার জন্য ব্যবহৃত ডিফল্ট প্রোগ্রাম।"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "লগ উইন্ডোর সর্বাধিক মাপ:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ পোর্টের ক্ষেত্রে লগ উইন্ডোর সর্বাধিক মাপ, বাইট অনুসারে ধার্য"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "দূরবর্তী ক্যারেক্টার সেট:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -432,11 +431,11 @@ msgstr ""
 "দূরবর্তী বার্তাগুলিকে বর্তমান লোকেইলে পরিবর্তন করার জন্য ব্যবহারযোগ্য বিভিন্ন "
 "ক্যারেক্টার সেটের তালিকা, কমা চিহ্ন দ্বারা বিভাজিত"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "দূরবর্তী LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -444,190 +443,199 @@ msgstr ""
 "দূরবর্তী অবস্থানের LC_TIME-র ক্ষেত্রে ব্যবহারযোগ্য মান। ডিরেক্টরির তালিকায় সঠিকরূপে "
 "তারিখের গণনা করার উদ্দেশ্যে এই ব্যবস্থা প্রয়োগ করা হয়।"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "ক্যাশে TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "ক্যাশের মধ্যে উপস্থিত এনট্রির মেয়াদ পূর্ণ হওয়ার পূর্বে চিহ্নিত সংখ্যক সেকেন্ড অবধি "
 "অপেক্ষা করা হবে।"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ফাইল পরিবহণ সংযোজন করুন"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "বর্তমানে চলমান ফাইল পরিবহণের সাথে নতুন পরিবহণ যোগ করুন"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "এক সময়ে একটি পরিবহণ করা হবে"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "একবারে শুধুমাত্র একটি পরিবহণ করা হবে কি?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "ডিফল্টরূপে প্রতিস্থাপন করা হবে"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "ডিফল্টরূপে, ফাইলগুলি নতুন করে লেখা হবে অথবা ফাইল পরিবহণ পুনরারম্ভের জন্য নির্ধারণ করুন"
+msgstr ""
+"ডিফল্টরূপে, ফাইলগুলি নতুন করে লেখা হবে অথবা ফাইল পরিবহণ পুনরারম্ভের জন্য নির্ধারণ করুন"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ফাইলের অনুমতি অপরিবর্তিত রাখা হবে"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "পরিবাহিত ফাইলের অনুমতি অপরিবর্তিত রাখা হবে"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ফাইলের সময় অপরিবর্তিত রাখা হবে"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "পরিবাহিত ফাইলের সময় অপরিবর্তিত রাখা হবে"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "প্রতিটি ফাইল পরিবহণের নবীকরণ করা হবে"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "প্রতিটি ফাইল পরিবহণের পরে লিস্ট-বক্সের তালিকা নবীকরণ করা হবে"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "অনুক্রমে ডিরেক্টরি প্রথমে থাকবে"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "প্রথমে ডিরেক্টরি ও পরে ফাইলের তালিকা প্রদর্শন করা হবে"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "আড়াল করা ফাইল প্রদর্শন করা হবে"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "আড়াল করা ফাইলগুলি লিস্ট-বক্সের মধ্যে প্রদর্শন করা হবে"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "বিনিময়ের প্রগতি শিরোনামের বারের মধ্যে প্রদর্শন করা হবে"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "শিরোনামের বারের মধ্যে ফাইল বিনিময়ের প্রগতি প্রদর্শন করা হবে"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ফাইল বিনিময় আরম্ভ করা হবে"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "পরিবহণের জন্য ফাইল তালিকাভুক্ত করা হলে স্বয়ংক্রিয়ভাবে তা আরম্ভ করা হবে"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI-র মধ্যে কমান্ড সঞ্চালনার অনুমতি প্রদান করা হবে"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "GUI-র মধ্যে ব্যবহারকারীদের দ্বারা কমান্ড সঞ্চালনার অনুমতি প্রদান করা হবে (টেক্সট "
 "পোর্ট ইত্যাদি ফাংশান)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "সর্বশেষ ডিরেক্টরি মনে রাখা হবে"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "অ্যাপ্লিকেশন বন্ধ করার সময়, সর্বশেষ ব্যবহৃত স্থানীয় ও দূরবর্তী ডিরেক্টরির তথ্য সংরক্ষণ "
 "করা হবে"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "প্রারম্ভকালে, দূরবর্তী সার্ভারের সাথে সংযোগ স্থাপন করা হবে"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
-msgstr "অ্যাপ্লিকেশন আরম্ভের সময়, স্বয়ংক্রিয়ভাবে দূরবর্তী সার্ভারের সাথে সংযোগ স্থাপন করা হবে।"
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+"অ্যাপ্লিকেশন আরম্ভের সময়, স্বয়ংক্রিয়ভাবে দূরবর্তী সার্ভারের সাথে সংযোগ স্থাপন করা হবে।"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "নেটওয়ার্কের সময়সীমা:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "নেটওয়ার্ক ইনপুট/আউটপুটের ক্ষেত্রে অপেক্ষার জন্য ধার্য সময়ের মেয়াদ। এটি কর্মবিহীন "
 "অবস্থার সময় সীমা নয়।"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "সংযোগে পুনঃপ্রচেষ্টা:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "পুনরায় প্রচেষ্টার সংখ্যা। প্রচেষ্টার কোনো সীমা ধার্য করতে ইচ্ছুক না হলে এই মান 0 "
 "হিসাবে ধার্য করুন"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "পুনঃপ্রচেষ্টার মধ্যে নিদ্রিত অবস্থার সময়:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "পুনরায় প্রচেষ্টার মধ্যে অপেক্ষার জন্য ধার্য সেকেন্ডের সংখ্যা"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "সর্বাধিক কিলোবাইট/সেকেন্ড:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "প্রত্যেক ফাইল পরিবহণের জন্য সর্বাধিক কিলোবাইট/সেকেন্ডের গতি।  (নিষ্ক্রিয় করার "
 "উদ্দেশ্যে মান 0 ধার্য করুন)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "পরিবহণের ক্ষেত্রে ব্লকের মাপ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "ফাইল পরিবহণকালে ব্যবহারযোগ্য ব্লকের মাপ। এটি ১০২৪-র গুণক হওয়া আবশ্যক।"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ডিফল্ট প্রোটোকল:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "ব্যবহারযোগ্য ডিফল্ট প্রোটোকল উল্লেখ করতে ব্যবহৃত হয়"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 সমর্থনব্যবস্থা সক্রিয় করা হবে"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -636,27 +644,27 @@ msgstr ""
 "করা হলে করণীয় কাজ এই মান দ্বারা চিহ্নিত হয়। 0=ফাইল প্রদর্শন 1=ফাইল সম্পাদনা "
 "2=ফাইল পরিবহণ"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "স্থানীয় ফাইল প্রদর্শনকারী লিস্ট-বক্সের ডিফল্ট প্রস্থ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "দূরবর্তী ফাইল প্রদর্শনকারী লিস্ট-বক্সের ডিফল্ট প্রস্থ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "স্থানীয়/দূরবর্তী ফাইল প্রদর্শনকারী লিস্ট-বক্সের ডিফল্ট উচ্চতা"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "বিনিময় প্রদর্শনকারী লিস্ট-বক্সের ডিফল্ট উচ্চতা"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "লগ প্রদর্শনকারী উইন্ডোর ডিফল্ট উচ্চতা"
 
-#: ../lib/options.h:177
+#: 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."
@@ -664,15 +672,15 @@ msgstr ""
 "পরিবহণের তথ্য প্রদর্শনকারী উইন্ডোর মধ্যে ফাইলের নাম শীর্ষক কলামের প্রস্থ। এই কলামের "
 "মাপ স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন।"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ক্রমবিন্যাসের জন্য ব্যবহৃত ডিফল্ট কলাম"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ছোট থেকে বড় অথবা বিপরীত দিশায় ক্রমবিন্যাস"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -681,7 +689,7 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -690,7 +698,7 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -699,7 +707,7 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -708,7 +716,7 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -717,7 +725,7 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -726,75 +734,75 @@ msgstr ""
 "স্বয়ংক্রিয়ভাবে পরিবর্তন করতে ইচ্ছুক হলে 0 নির্ধারণ করুন। কলামের এই বৈশিষ্ট্য নিষ্ক্রিয় "
 "করার জন্য -1 ধার্য করুন।"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "সার্ভারে প্রেরিত কমান্ডের জন্য ব্যবহৃত রং"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "সার্ভার থেকে প্রাপ্ত কমান্ডের জন্য ব্যবহৃত রং"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ত্রুটির বার্তার জন্য ব্যবহৃত রং"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "অবশিষ্ট লগ বার্তার জন্য ব্যবহৃত রং"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "স্থানীয়"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "বুকমার্ক"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ফাইল পরিবহণের গতি %.2f কিলোবাইট/সেকেন্ডে সীমিত করা হবে\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME-র মান '%s'-এ নির্ধারণ করতে ব্যর্থ। '%s' পুনরায় ব্যবহার করা হবে।\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "ক্যাশে থেকে %s-র ডিরেক্টরির তালিকা লোড করা হচ্ছে (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "সার্ভার থেকে %s-র ডিরেক্টরির তালিকা লোড করা হচ্ছে (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -803,112 +811,112 @@ msgstr ""
 "সতর্কবার্তা: '%s' ফাইলের থেকে পাথের তথ্য সরিয়ে ফেলা হচ্ছে। সরিয়ে ফেলার পাথের নাম "
 "(%s) বর্তমান ডিরেক্টরির সাথে সুসংগত নয় (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ত্রুটি: ক্যাশেতে লিখতে ব্যর্থ: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ত্রুটি: %s বুকমার্ক পাওয়া যায়নি\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "বুকমার্কের ত্রুটি: %s বুকমার্কের ক্ষেত্রে কোনো হোস্ট-নেম উপস্থিত নেই\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "'%s' প্রোটোকল বর্তমানে সমর্থিত নয়।\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "রিকার্সিভ সিম্বোলিক-লিংক %s প্রাপ্ত হয়েছে\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "ত্রুটি: দূরবর্তী অবস্থান %s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে। পুনঃপ্রচেষ্টার সর্বাধিক সংখ্যা "
 "সম্পূর্ণ হয়েছে...কর্ম পরিত্যাগ করা হচ্ছে\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "প্রধান pty %s খুলতে ব্যর্থ: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "সকেটের জুটি নির্মাণ করতে ব্যর্থ: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ত্রুটি: ssh সঞ্চালন করতে ব্যর্থ: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "একটি নতুন প্রসেস fork করতে ব্যর্থ: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "প্রক্সি হোস্ট-নেম:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ফায়ারওয়ালের হোস্ট-নেম"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "প্রক্সি পোর্ট:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ফায়ারওয়ালের মধ্যে সংযোগ করার উদ্দেশ্যে চিহ্নিত পোর্ট"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "প্রক্সি ব্যবহারকারীর নাম:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ফায়ারওয়ালে ব্যবহারকারীর নাম"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "প্রক্সি পাসওয়ার্ড:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ফায়ারওয়ালে পাসওয়ার্ড"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 ব্যবহার করা হবে"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -917,65 +925,65 @@ msgstr ""
 "সার্ভার থেকে প্রাপ্ত প্রত্যুত্তর সঠিক নয়, সংযোগ বিচ্ছিন্ন করা হচ্ছে\n"
 "দূরবর্তী সার্ভার থেকে প্রাপ্ত চাংকের মাপ '%s' বৈধ নয়\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "অফ-সেটে ফাইল বিনিময় আরম্ভ করা হবে "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s ফাইলটি উদ্ধার করতে ব্যর্থ\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ডিরেক্টরির তালিকা প্রাপ্ত করা হচ্ছে...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "সার্ভার থেকে প্রাপ্ত প্রত্যুত্তর সঠিক নয়, সংযোগ বিচ্ছিন্ন করা হচ্ছে\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE কমান্ড"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP প্রক্সি"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "স্বনির্ধারিত"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ই-মেইল ঠিকানা:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -983,19 +991,19 @@ msgstr ""
 "দূরবর্তী FTP সার্ভারে anonymous রূপে লগ-ইন করার সময় সর্বদা এই পাসওয়ার্ডটি ব্যবহার "
 "করা হবে"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "প্রক্সি অ্যাকাউন্ট:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ফায়ারওয়ালের অ্যাকাউন্ট (ঐচ্ছিক)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "প্রক্সি সার্ভারের ধরন:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1012,11 +1020,11 @@ msgstr ""
 "নাম), p (পাসওয়ার্ড), h (হোস্ট), o (পোর্ট) অথবা a (অ্যাকাউন্ট) ব্যবহার করা যাবে। "
 "উদাহরণস্বরূপ, প্রক্সি ব্যবহারকারী নির্ধারণের জন্য %pu প্রয়োগ করা যাবে।"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ঠিকানা উপেক্ষা করুন"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1028,11 +1036,11 @@ msgstr ""
 "IP ঠিকানার পরিবর্তে অভ্যন্তরীণ IP ঠিকানা উল্লেখ করার ফলে এই ব্যবস্থার প্রয়োগের "
 "প্রয়োজন দেখা দেয়।"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "পরোক্ষ ফাইল পরিবহণ"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1048,11 +1056,11 @@ msgstr ""
 "একটি পোর্ট উন্মুক্ত করা হবে ও দূরবর্তী সার্ভার দ্বারা এই পোর্টের সাথে সংযোগ স্থাপনের "
 "প্রচেষ্টা করা হবে।"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "দূরবর্তী সিম-লিংক মীমাংসা করা হবে (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1064,15 +1072,16 @@ msgstr ""
 "দ্বারা -L বিকল্প সহযোগে LIST প্রয়োগের বৈশিষ্ট্য সমর্থিত না হলে এটি নিষ্ক্রিয় করা "
 "উচিত।"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII মোডে ফাইল পরিবহণ করা হবে"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1082,332 +1091,325 @@ msgstr ""
 "নিষ্ক্রিয় রাখঅ যাবে। বাইনারি তথ্য ডাউনলোড করার সময়ও এই বৈশিষ্ট্যটি নিষ্ক্রিয় রাখার "
 "বাঞ্ছনীয়।"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ডাটা সংযোগ নির্মাণ করতে ব্যর্থ: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "একটি পোর্টের সাথে বাইন্ড করতে ব্যর্থ: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "একটি IPv6 সকেট নির্মাণ করতে ব্যর্থ: %s\n"
 
-#: ../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:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"ত্রুটি: সম্ভবত এই সংযোগের জন্য IPv6 ব্যবহার করা হয়নি। সংযোগ পরিত্যাগ করা হচ্ছে।\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "EPSV প্রত্যুত্তর '%s' বৈধ নয়\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "স্থানীয় সকেটের ঠিকানা প্রাপ্ত করতে ব্যর্থ: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "সার্ভার থেকে সংযোগ গ্রহণ করতে ব্যর্থ: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "সর্বমোট"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "সকেটের ফ্ল্যাগ পাওয়া যায়নি: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "অবরুদ্ধ না করার উদ্দেশ্যে সকেটের তথ্য প্রাপ্ত করতে ব্যর্থ: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH প্রোগামের নাম:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH এক্সেকিউটেবলের নাম"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH-র অতিরিক্ত পরামিতি:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH প্রোগ্রামে প্রেরণের জন্য অতিরিক্ত পরামিতি"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ব্যবহারকারীনাম/পাসওয়ার্ড প্রয়োজন"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH সংযোগের জন্য ব্যবহারকারীর নাম/পাসওয়ার্ড প্রয়োজন"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "%s প্রোগাম সঞ্চালিত হচ্ছে\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA-কির পাসওয়ার্ড পংক্তি লিখুন"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "কি-র পাসওয়ার্ড পংক্তি লিখুন '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "পাসওয়ার্ড"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "পাসওয়ার্ড"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(হ্যাঁ/না)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE লিখুন:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "পাসওয়ার্ড লিখুন"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID পাসওয়ার্ড লিখুন:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ত্রুটি: ভুল পাসওয়ার্ড লেখা হয়েছে\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: প্রোটোকল প্রারম্ভকরণ\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: প্রোটোকল সংস্করণ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s খুলুন\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: বন্ধ করুন\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: %s ডিরেক্টরি খুলুন\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ডিরেক্টরি পড়ুন\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: %s ফাইল মুছে ফেলুন\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: %s ডিরেক্টরি তৈরি করুন\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: %s ডিরেক্টরি মুছে ফেলুন\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ফাইলের বৈশিষ্ট্য\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ঠিক আছে"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "এই ধরনের কোনো ফাইল অথবা ডিরেক্টরি উপস্থিত নেই"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "অনুমতি প্রদান করা হয়নি"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ব্যর্থতা"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ভুল বার্তা"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "সংযোগবিহীন"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "সংযোগ বিচ্ছিন্ন হয়েছে"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "কর্ম সমর্থিত নয়"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "সার্ভার থেকে অজানা বার্তা প্রাপ্ত হয়েছে"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ত্রুটি: বার্তার মাপ %d অত্যাধিক বড়\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1415,41 +1417,41 @@ msgstr ""
 "দূরবর্তী সার্ভারের সাথে SSH সংযোগ স্থাপন করতে ত্রুটি দেখা দিয়েছে এবং নিম্নলিখিত "
 "বার্তাটি সার্ভার থেকে প্রাপ্ত হয়েছে:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s-র সাথে SSH সংযোগ আরম্ভ করা হচ্ছে\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH সার্ভার %s-এ সাফল্যের সাথে লগ-ইন করা হয়েছে\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL Engine"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy ফাইল:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropy ফাইল"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy Seed-র দৈর্ঘ্য:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL ইঞ্জিন seed করার জন্য ব্যবহৃত সর্বাধিক বাইটের সংখ্যা"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL Peer যাচাই করা হবে"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1462,11 +1464,11 @@ msgstr ""
 "বিষয় = %s\n"
 "ত্রুটি %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "পিয়ার সার্টিফিকেট প্রাপ্ত করতে ব্যর্থ\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1475,45 +1477,45 @@ msgstr ""
 "ত্রুটি: SSL সার্টিফিকেটের মধ্যে চিহ্নিত হোস্ট (%s)  ও সংযুক্ত হোস্টের (%s) মধ্যে "
 "গরমিল। সংযোগ পরিত্যাগ করা হচ্ছে।\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL লাইব্রেরি আরম্ভ করতে ব্যর্থ\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "ডিফল্ট SSL সার্টিফিকেট লোড করতে ত্রুটি\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "সাইফারের তালিকা নির্ধারণ করতে সমস্যা (বৈধ সাইফার অনুপস্থিত)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ত্রুটি: SSL ইঞ্জিন আরম্ভ করা হয়নি\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL সংযোগ আরম্ভ করতে ব্যর্থ (BIO অবজেক্ট)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL সংযোগ আরম্ভ করতে ব্যর্থ (SSL অবজেক্ট)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "পিয়ার সার্টিফিকেট সংক্রান্ত ত্রুটি: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "কর্ম বাতিল করা হয়েছে\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "পুনরায় সংযোগ করার পূর্বে %d সেকেন্ড অপেক্ষা করা হবে\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1523,73 +1525,73 @@ msgstr ""
 "সংশ্লিষ্ট বিবরণ উপস্থিত রয়েছে। এটি একটি মুক্ত সফ্টওয়্যার ও সুনির্দিষ্ট শর্তাধীন এটি "
 "আপনি বিতরণ করতে পারবেন; এই বিষয়ে অধিক বিবরণের জন্য COPYING ফাইলটি পড়ুন\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "অনুবাদক"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ব্যবহার পদ্ধতি: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ব্যবহার পদ্ধতি: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ব্যবহার পদ্ধতি: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ব্যবহার পদ্ধতি: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ব্যবহার পদ্ধতি: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ব্যবহার পদ্ধতি: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ব্যবহার পদ্ধতি: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "অবৈধ আর্গুমেন্ট\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ডিরেক্টরির ক্যাশে ফাঁকা করুন\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ব্যবহার পদ্ধতি: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ব্যবহার পদ্ধতি: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ত্রুটি: %s ভেরিয়েবলটি বৈধ কনফিগারেশন ভেরিয়েবল নয়।\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1597,290 +1599,292 @@ msgstr ""
 "সমর্থিত কমান্ড:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ব্যবহার পদ্ধতি: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "পরিচিতি"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP-র তথ্য প্রদর্শন করা হয়"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "ফাইল পরিবহণের বর্তমান মোড শুধুমাত্র Ascii রূপে ধার্য করা হয় (শুধুমাত্র FTP-র জন্য "
 "প্রযোজ্য)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "বাইনারি"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "ফাইল পরিবহণের বর্তমান মোড শুধুমাত্র বাইনারি রূপে ধার্য করা হয় (শুধুমাত্র FTP-র জন্য "
 "প্রযোজ্য)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "কাজের জন্য ব্যবহৃত দূরবর্তী ডিরেক্টরি পরিবর্তন করে"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "দূরবর্তী ফাইলের অনুমতি পরিবর্তন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "উপলব্ধ বিকল্প: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "দূরবর্তী অবস্থানের থেকে সংযোগ বিচ্ছিন্ন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "দূরবর্তী ফাইল মুছে ফেলতে ব্যবহৃত হয়"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
-msgstr "বর্তমান দূরবর্তী ডিরেক্টরির মধ্যে উপস্থিত ডিরেক্টরির তালিকা প্রদর্শন করতে ব্যবহৃত হয়"
+msgstr ""
+"বর্তমান দূরবর্তী ডিরেক্টরির মধ্যে উপস্থিত ডিরেক্টরির তালিকা প্রদর্শন করতে ব্যবহৃত হয়"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "দূরবর্তী ফাইল ডাউনলোড করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "সহায়ক তথ্য বিশিষ্ট এই পর্দাটি প্রদর্শিত হয়"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "কাজের জন্য ব্যবহৃত স্থানীয় ডিরেক্টরি পরিবর্তন করতে ব্যবহৃত হয়"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "স্থানীয় ফাইলের অনুমতি পরিবর্তন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "স্থানীয় ফাইল মুছে ফেলতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "বর্তমান স্থানীয় ডিরেক্টরির মধ্যে উপস্থিত ডিরেক্টরির তালিকা প্রদর্শন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "স্থানীয় ডিরেক্টরি নির্মাণ করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "বর্তমান স্থানীয় ডিরেক্টরি প্রদর্শিত হয়"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "স্থানীয় ফাইলের নাম পরিবর্তন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "স্থানীয় ডিরেক্টরি মুছে ফেলতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "দূরবর্তী ডিরেক্টরি নির্মাণ করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "স্থানীয় ফাইল আপলোড করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "দূরবর্তী অবস্থানের সাথে সংযোগ স্থাপন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "বর্তমান দূরবর্তী ডিরেক্টরি প্রদর্শন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP থেকে প্রস্থান"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "দূরবর্তী ফাইলের নাম পরিবর্তন করতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "দূরবর্তী ডিরেক্টরি মুছে ফেলতে ব্যবহৃত"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "কনফিগারেশন ফাইলের ভেরিয়েবল পরিবর্তন করতে ব্যবহৃত। set var=val প্রয়োগ করেও "
 "ভরিয়েবলের মান নির্ধারণ করা যায়"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "অবস্থানের জন্য সুনির্দিষ্ট কমান্ড সঞ্চালন করুন"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ত্রুটি: কমান্ড পাওয়া যায়নি\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "সাফল্যের সাথে %s পরিবহণ করা হয়েছে, %.2f কিলোবাইট/সেকেন্ড গতিতে \n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s ফাইলটি %s হোস্টে উপস্থিত এবং এটি উপেক্ষা করা হচ্ছে\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "হোস্ট %s-র মধ্যে পরিবহণ বন্ধ করা হচ্ছে\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s-কে %s থেকে ডাউনলোড করতে ব্যর্থ\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1889,35 +1893,35 @@ msgstr ""
 "%d-টি ফাইল অথবা ডিরেক্টরি পরিবহণ করা যায়নি। সঠিকভাবে না পরিবহণ হওয়া এই বস্তুগুলি "
 "সনাক্ত করার জন্য লগের তথ্য যাচাই করুন।"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: অন্য কোনো কাজ করার পূর্বে অনুগ্রহ করে 'বন্ধ' করার বাটনটি টিপুন\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "বুকমার্ক সঞ্চালন করুন"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "বুকমার্ক সংযোজন: বুকমার্কের নাম লেখা আবশ্যক\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "বুকমার্ক সংযোজন: %s নামক বুকমার্ক বর্তমানে উপস্থিত থাকার ফলে এটি যোগ করা সম্ভব নয়\n"
+msgstr ""
+"বুকমার্ক সংযোজন: %s নামক বুকমার্ক বর্তমানে উপস্থিত থাকার ফলে এটি যোগ করা সম্ভব নয়\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "বুকমার্ক সংযোজন"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "বুকমার্ক সংযোজন: হোস্ট-নেম উল্লেখ করা আবশ্যক\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1928,31 +1932,31 @@ msgstr ""
 "যাবে\n"
 "(উদাহরণ: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "পাসওয়ার্ড মনে রাখা হবে"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "বুকমার্কের জন্য নাম নির্ধারণ করা আবশ্যক।"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "নতুন ফোল্ডার"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "নির্মাণযোগ্য নতুন ফোল্ডারের নাম উল্লেখ করুন"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "নতুন বস্তু"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "নির্মাণযোগ্য নতুন সামগ্রীর নাম উল্লেখ করুন"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1961,106 +1965,99 @@ msgstr ""
 "আপনি কি নিশ্চিতরূপে বুকমার্ক\n"
 "%s ও এর অধীন উপস্থিত অন্যান্য নির্দেশকগুলি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "বুকমার্ক মুছে ফলুন"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "বুকমার্ক"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "এনট্রি সম্পাদনা করুন"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "বিবরণ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "হোস্ট-নেম:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "পোর্ট:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "প্রোটোকল:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "দূরবর্তী ডিরেক্টরি:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "স্থানীয় ডিরেক্টরি:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ব্যবহারকারীর নাম:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "অ্যাকাউন্ট:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  বাতিল  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ফাইল (_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ফাইল/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ফাইল/নতুন ফোল্ডার...(_F)"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ফাইল/নতুন সামগ্রী...(_I)"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ফাইল/মুছে ফেলুন (_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ফাইল/বিবিধ বৈশিষ্ট্য...(_P)"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ফাইল/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ফাইল/বন্ধ করুন (_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "বুকমার্ক সম্পাদনা"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2068,91 +2065,90 @@ msgstr ""
 "ফাইলের বৈশিষ্ট্য এখন পরিবর্তন করা সম্ভব হবে\n"
 "উল্লেখ্য: সকল ftp সার্ভার দ্বারা chmod সমর্থিত না হতে পারে"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "বিশেষ"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "স্টিকি"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ব্যবহারকারী"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "পড়া"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "লেখা"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "সঞ্চালনা"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "দল"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "আপনি কি নিশ্চিতরূপে %ld-টি ফাইল ও %ld-টি ডিরেক্টরি মুছে ফেলতে ইচ্ছুক"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "আপনি কি নিশ্চিতরূপে %ld-টি ফাইল মুছে ফেলতে ইচ্ছুক"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "আপনি কি নিশ্চিতরূপে %ld-টি ডিরেক্টরি মুছে ফেলতে ইচ্ছুক"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ফাইল/ডিরেক্টরি মুছে ফেলুন"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "মুছে ফেলুন"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "সংযোগ করুন"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "প্রাপ্ত URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "টেনে এনে ফেলুন"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "প্রস্থান"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2160,468 +2156,455 @@ msgstr ""
 "বর্তমানে কিছু ফাইল পরিবহণ করা হচ্ছে।\n"
 "আপনি কি নিশ্চিতরূপে প্রস্থান করতে ইচ্ছুক?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "অবস্থান খুলুন"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "সংযোগ স্থাপনার জন্য একটি URL উল্লেখ করুন"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FTP (_F)"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/উইন্ডো ১ (_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/উইন্ডো ২ (_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii (_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/বাইনারি (_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/বিবিধ বৈশিষ্ট্য...(_P)"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/প্রস্থান (_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/স্থানীয় (_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/স্থানীয়/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/স্থানীয়/অবস্থান খুলুন...(_O)"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/স্থানীয়/বিচ্ছিন্ন করুন (_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/স্থানীয়/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/স্থানীয়/ফাইলের spec পরিবর্তন করুন...(_F)"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/স্থানীয়/নির্বাচিত বস্তু প্রদর্শন করা হবে (_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/স্থানীয়/সমগ্র নির্বাচন (_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/স্থানীয়/সকল ফাইল নির্বাচন"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/স্থানীয়/সমগ্র নির্বাচন বাতিল"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/স্থানীয়/ডিরেক্টরির তালিকা সংরক্ষণ করুন..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/স্থানীয়/SITE কমান্ড প্রেরণ করুন..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/স্থানীয়/ডিরেক্টরি পরিবর্তন করুন (_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/স্থানীয়/অনুমতি...(_P)"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/স্থানীয়/নতুন ফোল্ডার...(_N)"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/স্থানীয়/নাম পরিবর্তন...(_m)"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/স্থানীয়/মুছে ফেলুন...(_D)"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/স্থানীয়/সম্পাদনা...(_E)"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/স্থানীয়/প্রদর্শন...(_V)"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/স্থানীয়/নবীকরণ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/দূরবর্তী (_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/দূরবর্তী/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/দূরবর্তী/অবস্থান খুলুন...(_O)"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/দূরবর্তী/বিচ্ছিন্ন করুন (_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/দূরবর্তী/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/দূরবর্তী/ফাইলের spec পরিবর্তন করুন...(_F)"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/দূরবর্তী/নির্বাচিত বস্তু প্রদর্শন করা হবে (_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/দূরবর্তী/সমগ্র নির্বাচন (_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/দূরবর্তী/সকল ফাইল নির্বাচন"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/দূরবর্তী/সমগ্র নির্বাচন বাতিল"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/দূরবর্তী/ডিরেক্টরির তালিকা সংরক্ষণ করুন..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/দূরবর্তী/SITE কমান্ড প্রেরণ করুন..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/দূরবর্তী/ডিরেক্টরি পরিবর্তন করুন (_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/দূরবর্তী/অনুমতি...(_P)"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/দূরবর্তী/নতুন ফোল্ডার...(_N)"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/দূরবর্তী/নাম পরিবর্তন...(_m)"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/দূরবর্তী/মুছে ফেলুন...(_D)"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/দূরবর্তী/সম্পাদনা...(_E)"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/দূরবর্তী/প্রদর্শন...(_V)"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/দূরবর্তী/নবীকরণ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/বুকমার্ক (_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/বুকমার্ক/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/বুকমার্ক/বুকমার্ক সংযোজন (_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/বুকমার্ক/বুকমার্ক সম্পাদনা"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/বুকমার্ক/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/পরিবহণ (_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/পরিবহণ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/পরিবহণ/আরম্ভ করুন (_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/পরিবহণ/বন্ধ করুন (_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/পরিবহণ/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/পরিবহণ/বর্তমান ফাইলটি উপেক্ষা করা হবে (_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/পরিবহণ/ফাইল মুছে ফেলুন (_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/পরিবহণ/ফাইল উপরে স্থানান্তর করুন (_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/পরিবহণ/ফাইল নীচে স্থানান্তর করুন (_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/পরিবহণ/ফাইল প্রাপ্ত করুন (_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/পরিবহণ/ফাইল স্থাপন করুন (_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/লগ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/লগ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/লগ/পরিশ্রুত করুন (_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/লগ/প্রদর্শন (_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/লগ/সংরক্ষণ...(_S)"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/সরঞ্জাম (_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/সরঞ্জাম/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/সরঞ্জাম/উইন্ডোর মধ্যে প্রভেদ পরীক্ষণ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/সরঞ্জাম/ক্যাশে পরিশ্রুত করুন (_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/সাহায্য"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/সাহায্য/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/সাহায্য/পরিচিতি (_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "হোস্ট: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "হোস্ট: (_H)"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "পোর্ট: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ব্যবহারকারী: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ব্যবহারকারী: (_U)"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "পাসওয়ার্ড: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "কমান্ড: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ফাইলের নাম"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "মাপ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "তারিখ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "বৈশিষ্ট্য"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "প্রগতি"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ত্রুটি: সংযোগ স্থাপনের উদ্দেশ্যে হোস্টে নাম উল্লেখ করা আবশ্যক\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "নবীকরণ"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ব্যবহারকারীর নাম লিখুন"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "অনুগ্রহ করে এই অবস্থানে প্রয়োগের উদ্দেশ্যে ব্যবহারকারীর নাম লিখুন"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "অনুগ্রহ করে এই অবস্থানে প্রয়োগের উদ্দেশ্যে পাসওয়ার্ড লিখুন"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "কর্ম বাতিল করা হয়েছে...পংক্তি উল্লেখ করা আবশ্যক\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "ডিরেক্টরি নির্মাণ করুন"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "নির্মাণযোগ্য ডিরেক্টরির নাম লিখুন"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "নাম পরিবর্তন"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s-র পরিবর্তিত নাম কী হবে?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "অবস্থান"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "অবস্থানের জন্য সুনির্দিষ্ট কমান্ড লিখুন"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "পূর্বে SITE উল্লেখ করুন"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "নতুন করে লিখুন"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "পুনরারম্ভ"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "উপেক্ষা করুন"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "কর্ম"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ফাইল পরিবহণ"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2629,59 +2612,59 @@ msgstr ""
 "নিম্নলিখিত ফাইল(গুলি) স্থানীয় ও দূরবর্তী কম্পিউটারের মধ্যে উপস্থিত রয়েছে\n"
 "এইগুলির জন্য কী ব্যবস্থা নেওয়া হবে তা অনুগ্রহ করে নির্বাচন করুন"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ত্রুটি"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ফাইল উপেক্ষা করা হবে"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "সমগ্র নির্বাচন"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "সমগ্র নির্বাচন বাতিল"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec পরিবর্তন: কর্ম বাতিল করা হয়েছে...পংক্তি লেখা আবশ্যক\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec পরিবর্তন"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ত্রটি: লেখার জন্য %s খোলা যায়নি: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ডিরেক্টরির তালিকা সংরক্ষণ করুন"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ত্রুটি: %s-এ লিখতে সমস্যা: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "সাফল্যের সাথে %s-র মধ্যে লগ ফাইল লেখা হয়েছে\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "লগ সংরক্ষণ করুন"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2690,11 +2673,11 @@ msgstr ""
 "লাইসেন্স চুক্তিপত্র বিশিষ্ট COPYING নামক ফাইলটি পাওয়া যায়নি। অনুগ্রহ করে পরীক্ষা করুন "
 "এই ফাইলটি %s অথবা %s-র মধ্যে উপস্থিত রয়েছে কি না"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP পরিচিতি"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2705,27 +2688,23 @@ msgstr ""
 "স্বত্বাধিকার (C) ১৯৯৮-২০০৭ ব্রায়েন মেসনি <masneyb gftp org>\n"
 "প্রধান হোম-পেজ: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "পরিচিতি"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "লাইসেন্স চুক্তিপত্র"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  বন্ধ করুন  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "উইন্ডোর মধ্যে প্রভেদ পরীক্ষণ"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "দূরবর্তী সার্ভারের সাথে সংযোগ বিচ্ছিন্ন করুন"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2733,72 +2712,56 @@ msgstr ""
 "হোস্ট এনট্রির মধ্যে উল্লিখিত অবস্থানের সাথে সংযোগ স্থাপন করা হবে। হোস্টের মধ্যে কোনো "
 "এনট্রি উপস্থিত না থাকলে, URL লেখার উদ্দেশ্যে একটি ডায়লগ প্রদর্শন করা হবে।"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "সর্বধরনের ফাইল"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (ক্যাশে করা) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "সংযোগ স্থাপিত নয়"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s ফাইল খুলতে ব্যর্থ: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: দূরবর্তী অবস্থানের সাথে সংযুক্ত নয়\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: এই প্রোটোকলের সাথে ব্যবহারের জন্য এই বৈশিষ্ট্য উপলব্ধ নেই\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: শুধুমাত্র একটি সামগ্রী বাছাই করা আবশ্যক\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: অন্তত একটি সামগ্রী বাছাই করা আবশ্যক\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "পরিবর্তন করুন"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "যোগ করুন"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "বাতিল"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  হ্যাঁ  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  নাম  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ডিরেক্টরির তালিকা প্রাপ্ত করা হচ্ছে"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  বন্ধ করুন  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2807,109 +2770,89 @@ msgstr ""
 "%ld-টি ডিরেক্টরি\n"
 "ও %ld-টি ফাইল প্রাপ্ত হয়েছে"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-র ত্রুটি: %s ফাইলটি %s অথবা %s-র মধ্যে পাওয়া যায়নি\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "হোস্ট সম্পাদনা"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "হোস্ট যোগ করুন"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "ধরন:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "ধরন: (_T)"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ডোমেইন"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "নেটওয়ার্কের ঠিকানা"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "নেটওয়ার্কের ঠিকানা: (_N)"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "নেটমাস্ক"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "নেটমাস্ক: (_e)"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ডোমেইন: (_D)"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "নেটমাস্ক"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "স্থানীয় হোস্ট"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "সম্পাদনা"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "বিকল্প"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "প্রয়োগ করুন"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ফাইলের নাম প্রাপ্ত করা হচ্ছে..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "সংযোগ স্থাপন করা হচ্ছে..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ফাইল প্রাপ্ত করুন: দূরবর্তী অবস্থানের সাথে সংযুক্ত নয়\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ত্রুটি: %d চাইল্ড থেকে %d প্রাপ্ত হয়েছে\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "%d চাইল্ড থেকে সাফল্যের বার্তা প্রাপ্ত হয়েছে\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "ত্রুটি: %d চাইল্ড সঠিকভাবে বন্ধ করা হয়নি\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ত্রুটি: %s ফাইল সংক্রান্ত তথ্য পাওয়া যায়নি: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "%s ফাইল পরিবর্তন করা হয়নি\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2918,121 +2861,159 @@ msgstr ""
 "%s ফাইল পরিবর্তিত হয়েছে।\n"
 "আপনি কি এটি আপলোড করতে ইচ্ছুক?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ফাইল সম্পাদনা"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "সমাপ্ত"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "%s পাঠানো হয়েছে সর্বমোট %s, %.2fকিলোবাইট/সেকেন্ড গতিতে  পরিবহণের পরে আনুমানিক "
 "অবশিষ্ট সময়  %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "%s প্রাপ্ত হয়েছে সর্বমোট %s, %.2fকিলোবাইট/সেকেন্ড গতিতে  পরিবহণের পরে আনুমানিক "
 "অবশিষ্ট সময়  %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s পাঠানো হয়েছে, সর্বমোট %s, পরিবহণ স্থগিত এবং আনুমানিক অবশিষ্ট সময় অজানা"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s প্রাপ্ত হয়েছে, সর্বমোট %s, পরিবহণ স্থগিত এবং আনুমানিক অবশিষ্ট সময় অজানা"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "সমাপ্ত কর্মের অংশের শতাংশ অজানা। (ফাইল %ld, সর্বমোট %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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। (ফাইল %ld, সর্বমোট %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ফাইলের নাম প্রাপ্ত করা হচ্ছে...%s বাইট"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "প্রদর্শন"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "সম্পাদনা"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "প্রদর্শন: একটি পৃথক প্রসেস fork করা সম্ভব নয়: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "সঞ্চালিত প্রোগ্রাম: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s খুলতে %s ব্যবহার করা হচ্ছে\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s ফাইল প্রদর্শিত হচ্ছে\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "প্রদর্শন: %s ফাইল খুলতে ব্যর্থ: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "নিয়ন্ত্রণকারী টার্মিন্যাল %s খুলতে ব্যর্থ\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ব্যবহারকারীর নাম [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s বর্তমানে উপস্থিত। (%s উৎসের মাপ, %s গন্তব্যস্থলের মাপ):\n"
 "নতুন করে লিখুন(o), পুনরারম্ভ(r), উপেক্ষা করুন(s), সমস্ত নতুন করে লিখুন(O), সমস্ত "
 "পুনরারম্ভ করুন(R), সমস্ত উপেক্ষা করুন(S): (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  বাতিল  "
+
+#~ msgid "Host: "
+#~ msgstr "হোস্ট: "
+
+#~ msgid "User: "
+#~ msgstr "ব্যবহারকারী: "
+
+#~ msgid "  Close  "
+#~ msgstr "  বন্ধ করুন  "
+
+#~ msgid "Add"
+#~ msgstr "যোগ করুন"
+
+#~ msgid "Cancel"
+#~ msgstr "বাতিল"
+
+#~ msgid "  Yes  "
+#~ msgstr "  হ্যাঁ  "
+
+#~ msgid "  No  "
+#~ msgstr "  নাম  "
+
+#~ msgid "Type:"
+#~ msgstr "ধরন:"
+
+#~ msgid "Network Address"
+#~ msgstr "নেটওয়ার্কের ঠিকানা"
+
+#~ msgid "_Edit"
+#~ msgstr "সম্পাদনা (_E)"
+
+#~ msgid "Apply"
+#~ msgstr "প্রয়োগ করুন"
diff --git a/po/ca.po b/po/ca.po
index 9b154b6..d624174 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,93 +5,101 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-11 08:29+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-04-11 08:30+0200\n"
 "Last-Translator: Josep Puigdemont <josep puigdemont gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "L'URL %s no és vàlida\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Error: la línia %s del fitxer d'índex de la memòria cau no és vàlida\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Error: no s'ha pogut crear el directori %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error: no s'ha pogut crear el fitxer temporal: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "S'ha produït un error en tancar el descriptor de fitxer: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Error: no s'ha pogut cercar dins del fitxer %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3200
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"S'ha produït un error en convertir la cadena «%s» del joc de caràcters %s al "
+"joc de caràcters %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error: no s'ha pogut obrir el fitxer local %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2901 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Error: no s'ha pogut escriure al sòcol: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2823 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Error: no s'ha pogut llegir del sòcol: %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 ""
 "Error del gFTP: el nom del fitxer d'adreces d'interès %s no és correcte\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Avís: no s'ha pogut trobar el fitxer d'adreces d'interès mestre %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 ""
 "Error del gFTP: no s'ha pogut obrir el fitxer d'adreces d'interès %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Avís del gFTP: s'ha omès la línia %d del fitxer d'adreces d'interès: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Avís del gFTP: la línia %d no té prou arguments\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 "
@@ -101,7 +109,7 @@ msgstr ""
 "de passar pel servidor intermediari (si està disponible). Sintaxi: "
 "dont_use_proxy=.domini o dont_use_proxy=nombre de xarxa/màscara de xarxa"
 
-#: ../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"
@@ -109,55 +117,55 @@ msgstr ""
 "ext=extensió:fitxer XPM:Ascii o Binari (A o B):programa de visualització. "
 "Nota: tots els arguments menys l'extensió són opcionals"
 
-#: ../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 "Error del gFTP: el nom del fitxer de configuració %s no és correcte\n"
 
-#: ../lib/config_file.c:599
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Error del gFTP: no s'ha pogut crear el directori %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 ""
 "Error del gFTP: no s'ha pogut trobar el fitxer de configuració mestre %s\n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ja heu fet make install?\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 "Error del gFTP: no s'ha pogut obrir el fitxer de configuració %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 ""
 "S'està finalitzant atès que s'han produït errors d'anàlisi a la línia %d del "
 "fitxer de configuració.\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 "Avís del gFTP: s'ometrà la línia %d del fitxer de configuració: %s\n"
 
-#: ../lib/config_file.c:672
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Error del gFTP: el nom del fitxer de registre %s no és correcte\n"
 
-#: ../lib/config_file.c:678
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Avis del gFTP: no s'ha pogut obrir %s per a l'escriptura: %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"
@@ -166,7 +174,7 @@ msgstr ""
 "<masneyb gftp org>. Avís: se sobreescriurà qualsevol comentari que "
 "s'afegeixi a aquest fitxer"
 
-#: ../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 "
@@ -179,7 +187,7 @@ msgstr ""
 "aquest fitxer. Abans d'això, totes les contrasenyes es desaven en text "
 "normal."
 
-#: ../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. "
@@ -190,95 +198,96 @@ msgstr ""
 "s'afegeixi a aquest fitxer. Si l'entrada té un (*) al comentari, no podreu "
 "canviar-la des del gFTP"
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:391 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconegut>"
 
 # FIXME
-#: ../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 ""
 "Error FATAL de gFTP: No s'ha trobat l'opció de configuració «%s» a la taula "
 "de hash global\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error: no s'ha pogut pujar el fitxer %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error: no s'ha pogut escriure al fitxer %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error: error en tancar el fitxer %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "El llistat de fitxers del servifor FSP %s és corrupte\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1578
-#: ../lib/protocols.c:1579 ../lib/protocols.c:1620 ../lib/protocols.c:1621
-#: ../lib/protocols.c:1687 ../lib/protocols.c:1694 ../lib/protocols.c:1770
-#: ../lib/protocols.c:1771 ../lib/protocols.c:1807
+#: 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 "desconegut"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "No s'ha pogut obtenir el llistat del directori FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "S'ha canviat amb èxit al directori %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "No s'ha pogut canviar al directori %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "S'ha suprimit %s amb èxit\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Error: no s'ha pogut suprimir el directori %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error: no s'ha pogut suprimir el fitxer %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "S'ha creat amb èxit el directori %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "S'ha canviat el nom de %s a %s amb èxit\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Error: no s'ha pogut canviar el nom de %s a %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"
@@ -286,7 +295,7 @@ msgstr ""
 "L'FTPS no està disponible ja que no es va compilar amb SSL. S'està avortant "
 "la connexió.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -294,112 +303,105 @@ msgstr ""
 "L'HTTPS no està disponible ja que no es va compilar amb SSL. S'està avortant "
 "la connexió.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "No s'ha pogut obtenir el directori de treball actual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "S'ha canviat amb èxit el directori local a %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "No s'ha pogut canviar el directori local a %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Error: No s'ha pogut truncar el fitxer local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "No s'ha pogut obtenir el llistat del directori local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "S'ha canviat el mode de %s a %o amb èxit\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Error: no s'ha pogut canviar el mode de %s a %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "S'ha canviat amb èxit la marca de temps de %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Error: no s'ha pogut canviar la marca de temps de %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema de fitxers local"
 
-#: ../lib/misc.c:407
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "forma d'ús: gftp "
 
-#: ../lib/misc.c:407 ../lib/rfc2068.c:301 ../src/uicommon/gftpui.c:630
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "cap"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fitxer"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "mida"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "usuari"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grup"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datahora"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributs"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendent"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendent"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programa visualitzador:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -407,27 +409,27 @@ msgstr ""
 "El programa que s'emprarà per defecte per visualitzar fitxers. Si està buit, "
 "s'emprarà el visualitzador intern."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programa editor:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "El programa emprat per defecte per a editar fitxers."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Mida màxima de la finestra del registre:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "La mida màxima de la finestra del registre per la versió GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conjunt de caràcters remots:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -435,11 +437,11 @@ msgstr ""
 "Això és una llista de conjunts de caràcters separada per comes per intentar "
 "convertir els missatges remots al conjunt de caràcters local"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remot:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -447,192 +449,196 @@ msgstr ""
 "Aquest és el valor de LC_TIME del lloc remot. Això permet analitzar les "
 "dates correctament en els llistats del directori."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Temps d'expiració de la memòria cau:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "El temps en segons abans que les dades de la memòria cau no expirin."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Afegeix transferències de fitxers"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Afegeix les noves transferències a les ja existents"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Fes les transferències d'una en una"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Voleu fer les transferències d'una en una?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sobreescriu per defecte"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Per defecte sobreescriure els fitxers o estableix que es reprengui la "
 "transferència de fitxers"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Conserva els permisos dels fitxers"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Conserva els permisos dels fitxers transferits"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Conserva la data dels fitxers"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Conserva la data dels fitxers transferits"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Refresca després de cada transferència de fitxers"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Refresca la llista de fitxers després de cada transferència de fitxers"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Mostra els directoris primer"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Posa els directoris davant dels fitxers"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostra els fitxers ocults"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostra els fitxers ocults a les llistes de fitxers"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostra l'estat de la transferència al títol"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostra l'estat de la transferència a la barra de títol"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Inicia la transferència de fitxers"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Inicia automàticament la transferència de fitxers quan es posin a la cua"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permet ordres manuals a la GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permet introduir ordres manualment a la GUI (funcions com en la versió de "
 "text)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Recorda el darrer directori"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Desa els darrers directoris local i remot quan l'aplicació es tanqui"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Connecta al servidor remot en iniciar"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Connecta automàticament al servidor remot quan s'iniciï l'aplicació."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Temps d'espera de la xarxa:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "El temps d'espera per entrada/sortida de xarxa. No és un temps d'inactivitat."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Intents de connexió:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "El nombre d'intents de connexió. Si és 0 s'anirà intentant infinitament"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Temps d'espera entre intents:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "El nombre de segons a esperar entre intents de reconnexió"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KB/s màxim:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "El màxim de KB/s que una transferència pot tenir. (Establiu-lo a 0 per "
 "desactivar)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Mida del bloc de transferència:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "La mida del bloc de transfarència s'utilitza en transferir fitxers. Ha de "
 "ser un múltiple de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocol per defecte:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Especifica el protocol a emprar per defecte"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Permet l'ús d'IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -640,27 +646,27 @@ msgstr ""
 "Això defineix el que passarà en fer doble clic en un fitxer de la llista de "
 "fitxers. 0=Mostra el fitxer 1=Edita el fitxer 2=Transfereix el fitxer"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "L'amplada per defecte de la llista de fitxers local"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "L'amplada per defecte de la llista de fitxers remota"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "L'alçària per defecte de les llistes de fitxers remota/local"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "L'alçària per defecte de la llista de transferències"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "L'alçària per defecte de la finestra del registre"
 
-#: ../lib/options.h:177
+#: 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."
@@ -668,15 +674,15 @@ msgstr ""
 "L'amplada de la columna del nom de fitxer a la finestra de transferència. "
 "Establiu-la a 0 perquè la columna es redimensioni automàticament."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "La columna que s'utilitzarà per ordenar per defecte"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordena ascendent o descendentment"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -685,7 +691,7 @@ msgstr ""
 "la a 0 perquè es redimensioni automàticament. Establiu-la a -1 per "
 "inhabilitar aquesta columna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -694,7 +700,7 @@ msgstr ""
 "perquè es redimenioni automàticament. Establiu-la a -1 per inhabilitar "
 "aquesta columna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -703,7 +709,7 @@ msgstr ""
 "perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
 "aquesta columna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -712,7 +718,7 @@ msgstr ""
 "perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
 "aquesta columna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -721,7 +727,7 @@ msgstr ""
 "perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
 "aquesta columna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -730,85 +736,77 @@ msgstr ""
 "0 perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
 "aquesta columna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "El color de les ordres que s'envien al servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "El color de les ordres que es reben del servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "El color dels missatges d'error"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "El color de la resta de missatges del registre"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Adreça d'interès"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:234
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "La transferència és passarà a %.2f KB/s\n"
 
-#: ../lib/protocols.c:387
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "S'ha produït un error en establir LC_TIME a «%s». S'utilitzarà «%s»\n"
 
-#: ../lib/protocols.c:398
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 "S'està carregant el llistat del directori %s de la memòria cau (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:408
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 "S'està carregant el llistat del directori %s del servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:471
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"S'ha produït un error en convertir la cadena «%s» del joc de caràcters %s al "
-"joc de caràcters %s: %s\n"
-
-#: ../lib/protocols.c:696
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -817,173 +815,113 @@ msgstr ""
 "Avís: s'ha extret la part del camí del fitxer «%s». La part del camí extreta "
 "(%s) no coincideix amb el directori actual (%s)\n"
 
-#: ../lib/protocols.c:722
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: no s'ha pogut escriure a la memòria cau: %s\n"
 
-#: ../lib/protocols.c:755
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: no s'ha pogut trobar l'adreça d'interès %s\n"
 
-#: ../lib/protocols.c:762
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Error en l'adreça d'interès: L'adreça d'interès %s no té cap nom "
 "d'ordinador\n"
 
-#: ../lib/protocols.c:884 ../lib/protocols.c:911
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "El protocol «%s» no està implementat actualment.\n"
 
-#: ../lib/protocols.c:1201 ../lib/protocols.c:1216 ../lib/protocols.c:2398
-#: ../lib/protocols.c:2511
-#, c-format
-msgid "Looking up %s\n"
-msgstr "S'està cercant %s\n"
-
-#: ../lib/protocols.c:1207 ../lib/protocols.c:1222 ../lib/protocols.c:2403
-#: ../lib/protocols.c:2516
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "No s'ha pogut trobar %s: %s\n"
-
-#: ../lib/protocols.c:2133
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "S'ha trobat un enllaç simbòlic recursiu %s\n"
 
-#: ../lib/protocols.c:2421
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "No s'ha pogut crear un sòcol: %s\n"
-
-#: ../lib/protocols.c:2427 ../lib/protocols.c:2533
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "S'està intentant amb %s:%d\n"
-
-#: ../lib/protocols.c:2432 ../lib/protocols.c:2540
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "No s'ha pogut connectar a %s: %s\n"
-
-#: ../lib/protocols.c:2470 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "No s'ha pogut crear un sòcol IPv4: %s\n"
-
-# FIXME "/etc/services"
-#: ../lib/protocols.c:2494 ../lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-"No s'ha pogut trobar el nom del servei %s/tcp. Comproveu el fitxer /etc/"
-"services\n"
-
-#: ../lib/protocols.c:2556 ../lib/protocols.c:3209 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Error: No es pot establir el senyalador de tancar en executar: %s\n"
-
-#: ../lib/protocols.c:2563
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "S'ha connectat a %s:%d\n"
-
-#: ../lib/protocols.c:2799 ../lib/protocols.c:2876 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "La connexió a %s ha expirat\n"
-
-#: ../lib/protocols.c:2946
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "No s'han pogut obtenir els senyaladors del sòcol: %s\n"
-
-#: ../lib/protocols.c:2960
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "El sòcol no s'ha pogut establir a no-blocant: %s\n"
-
-#: ../lib/protocols.c:3106
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Error: El lloc remot %s ha desconnectat. S'ha arribat al màxim de "
 "reintents... es deixarà córrer\n"
 
-#: ../lib/protocols.c:3114
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Error: El lloc remot %s ha desconnectat. Es reconnectarà d'aquí a %d segons\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Error: No es pot establir el senyalador de tancar en executar: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "No s'ha pogut obrir el pty mestre %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "No s'ha pogut crear una parella de sòcols: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error: no s'ha pogut executar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "No s'ha pogut crear un altre procés: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nom del servidor intermediari:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nom del tallafoc"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port del servidor intermediari:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port del tallafoc a on connectar"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nom d'usuari al servidor intermediari:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "El vostre nom d'usuari al tallafoc"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Contrasenya del servidor intermediari:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "La vostra contrasenya al tallafoc"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Empra HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Voleu emprar HTTP/1.1 o HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -992,66 +930,66 @@ msgstr ""
 "S'ha rebut una resposta incorrecta del servidor, s'està desconnectant\n"
 "El servidor remot ha retornat una mida de paquet invàlida «%s»\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "S'està desconnectant de %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "S'està iniciant la transferència del fitxer pel punt "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "No s'ha pogut obtenir el fitxer %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "S'està obtenint el llistat del directori...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 "S'ha rebut una resposta incorrecta del servidor, s'està desconnectant\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Ordre SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "usuari ordinador"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "usuari ordinador:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICA"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "usuari ordinador port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "usuari ordinador NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Servidor intermediari HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1059,19 +997,19 @@ msgstr ""
 "Aquesta és la contrasenya que s'emprarà per entrar anònimament a un servidor "
 "FTP remot"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Compte al servidor intermediari:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "El vostre compte al tallafoc (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipus de servidor intermediari:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1089,11 +1027,11 @@ msgstr ""
 "(compte). Per exemple, per especificar l'usuari al servidor intermediari, "
 "hauríeu d'escriure %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignora l'adreça PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1105,11 +1043,11 @@ msgstr ""
 "proporcionen la seva adreça interna enlloc de la seva adreça IP externa en "
 "una resposta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferència de fitxers passiva"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1124,11 +1062,11 @@ msgstr ""
 "no ho implementi. Si està desactivat, llavors el gFTP obrirà un port a la "
 "banda del client i el servidor remot s'hi intentarà connectar."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resol els enllaços simbòlics remots (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1140,15 +1078,16 @@ msgstr ""
 "només voldreu desactivar això en cas que el servidor FTP remot no implementi "
 "l'opció -L a LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transfereix els fitxers en mode ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1158,275 +1097,329 @@ msgstr ""
 "UNIX a UNIX, és segur tenir-ho desactivat. Si esteu descarregant dades "
 "binàries, és millor que ho tingueu desactivat."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "S'ha rebut una resposta no vàlida '%c' del servidor.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "No s'ha pogut crear un sòcol 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 "No s'ha trobat cap adreça IP a la resposta de PASV «%s»\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 ""
-"S'ignorarà l'adreça IP de la resposta PASV, s'està connectant a %d.%d.%d.%d:%"
-"d\n"
+"S'ignorarà l'adreça IP de la resposta PASV, s'està connectant a %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 "No s'ha pogut crear una connexió de dades: %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 "No s'ha pogut obtenir el nom del sòcol: %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 "No s'ha pogut fer vincular a un port: %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 "No s'ha pogut escoltar el port %d: %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "No s'ha pogut crear un sòcol 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 ""
 "Error: No sembla que estiguem connectats a través de IPv6. S'està avortant "
 "la connexió.\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 "La resposta EPSV «%s» no és vàlida\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "No s'ha pogut obtenir l'adreça del sòcol local: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "No s'ha pogut acceptar la connexió del servidor: %s\n"
 
-#: ../lib/rfc959.c:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1594
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Avís: No s'ha pogut analitzar el llistat %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "S'està cercant %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 "No s'ha pogut trobar %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "No s'ha pogut crear un sòcol: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "S'està intentant amb %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 "No s'ha pogut connectar a %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'ha connectat a %s:%d\n"
+
+# FIXME "/etc/services"
+#: 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 ""
+"No s'ha pogut trobar el nom del servei %s/tcp. Comproveu el fitxer /etc/"
+"services\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "La connexió a %s ha expirat\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "No s'han pogut obtenir els senyaladors del sòcol: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "El sòcol no s'ha pogut establir a no-blocant: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nom del programa SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "La ruta a l'executable SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Paràmetres SSH extra:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Paràmetres extra que es passaran al programa SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Cal un usuari/contrasenya SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Demana un nom d'usuari/contrasenya per a connexions SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "S'està executant el programa %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Entreu la contrasenya per a la clau RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Entreu la contrasenya per a la clau '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "contrasenya"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(sí/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Entreu la contrasenya:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduïu la contrasenya SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Error: S'ha introduït una contrasenya incorrecta\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialització del protocol\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versió %d del protocol\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Obre %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Tanca\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Obre el directori %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Llegeix el directori\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Elimina el fitxer %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Crea el directori %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Elimina el directori %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Camí real %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributs del fitxer\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "D'acord"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Aquest fitxer o directori no existeix."
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Ha fallat"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Missatge incorrecte"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Sense connexió"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "S'ha perdut la connexió"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "L'operació no està implementada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "El servidor ha retornat un missatge desconegut"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Error: La mida (%d) del missatge és massa gran\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Error: La mida (%d) del missatge del servidor és massa gran\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1434,41 +1427,41 @@ msgstr ""
 "S'ha produït un error en iniciar una connexió SSH amb el servidor remot. "
 "Aquest és el missatge d'error del servidor remot:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "S'està obrint una connexió SSH a %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "S'ha entrat amb èxit al servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Fitxer d'entropia SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Fitxer d'entropia SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Longitud de la llavor d'entropia:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "El nombre màxim de bytes a donar a la llavor del motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verifica l'altra part SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1481,11 +1474,11 @@ msgstr ""
 "Assumpte = %s\n"
 "Error %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "No es pot obtenir el certificat de l'altra part\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 "
@@ -1494,57 +1487,47 @@ msgstr ""
 "Error: L'ordinador al certificat SSL (%s) no concorda amb el que s'ha "
 "connectat (%s). S'està avortant la connexió.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "No s'ha pogut iniciar la biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "S'ha produït un error en carregar els certificats SSL per defecte\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "S'ha produït un error en establir la llista de codis (no hi ha codis "
 "vàlids)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Error: El motor SSL no ha estat inicialitzat\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "S'ha produït un error em establir la connexió SSL (objecte BIO)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "S'ha produït un error en establir la connexió SSL (objecte SSL)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "S'ha produït un error en el certificat de l'altra part: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "S'ha cancel·lat l'operació\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "S'esperaran %d segons abans d'intentar connectar un altre cop\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 ""
-">. Si teniu preguntes, comentaris, o suggeriments sobre aquest programa, "
-"escriviu-me un correu electrònic. Podeu trobar les darreres notícies quant "
-"al gFTP a la web http://www.gftp.org/\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 "
@@ -1554,76 +1537,76 @@ msgstr ""
 "fitxer COPYING. Això és programari lliure, i podeu redistribuir-lo sota "
 "certes condicions; per a més detalls, consulteu el fitxer COPYING\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Traduït per Josep Puigdemont <josep puigdemont gmail com>, i Albert Astals "
 "Cid <astals11 terra es>"
 
-#: ../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 "Error: no esteu connectat a cap lloc remot\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "forma d'ús: chmod <mode> <fitxer>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "forma d'ús: rename <nom antic> <nom nou>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "forma d'ús: delete <fitxer>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "forma d'ús: rmdir <directori>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "forma d'ús: site <ordre remota>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "forma d'ús: mkdir <directori nou>\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 "forma d'ús: chdir <directori>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "L'argument no és vàlid\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Neteja el directori de la memòria cau\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "forma d'ús: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "forma d'ús: set [variable = valor]\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 "Error: la variable %s no és una variable de configuració vàlida.\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 ""
 "Error: la variable %s no està disponible en la versió de text del gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1631,287 +1614,287 @@ msgstr ""
 "Ordres implementades:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "forma d'ús: %s <màscara>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Mostra informació  quant al gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Estableix el mode de transmissió de fitxers a ascii (només per a FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Estableix el mode de transmissió de fitxers a binari (només per a FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Canvia el directori de treball remot"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Canvia els permisos d'un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opcions disponibles: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desconnecta del lloc remot"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Suprimeix un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Mostra la llista de fitxers del directori remot actual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Descarrega fitxers remots"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Mostra aquesta finestra d'ajuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Canvia el directori de treball local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Canvia els permisos d'un fitxer local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Suprimeix un fitxer local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Mostra la llista de fitxers del directori local actual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crea un directori local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Mostra el directori local actual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Canvia el nom d'un fitxer local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Suprimeix un directori local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crea un directori remot"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Puja fitxers locals"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Obre una connexió a un lloc remot"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Mostra el directori remot actual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Surt del gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Canvia el nom d'un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Suprimeix un directori remot"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Mostra les variables del fitxer de configuració. També es poden establir "
 "variables amb «set var=val»"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Executa una ordre específica del lloc remot"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Error: no s'ha reconegut l'ordre\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "S'ha transferit %s amb èxit a %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "S'està ometent el fitxer %s de l'ordinador %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "S'està aturant la transferència de l'ordinador %s\n"
 
-#: ../src/uicommon/gftpui.c:1502
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "No s'ha pogut descarregar %s de %s\n"
 
-#: ../src/uicommon/gftpui.c:1558
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1920,39 +1903,38 @@ msgstr ""
 "No s'han pogut transferir %d fitxers o directoris. Comproveu el registre per "
 "saber els elements que no s'han transferit."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: premeu el botó d'aturar abans de fer res més\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Executa una adreça d'interès"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 "Afegeix una adreça d'interès: heu d'introduir un nom per a l'adreça "
 "d'interès\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Afegeix una adreça d'interès: no es pot afegir l'adreça d'interès %s perquè "
 "ja n'hi ha una amb aquest nom\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Afegeix una adreça d'interès"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Afegeix una adreça d'interès: heu d'introduir un nom d'ordinador\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1962,31 +1944,31 @@ msgstr ""
 "Podeu separar els elements amb / per a introduir l'adreça\n"
 "d'interès a un submenú (p.ex.: Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Recorda la contrasenya"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Heu d'indicar el nom per a l'adreça d'interès."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Carpeta nova"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduïu el nom de la carpeta nova a crear"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Element nou"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduïu el nom de l'element nou a crear"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1995,106 +1977,99 @@ msgstr ""
 "Esteu segur de voler eliminar l'adreça\n"
 "d'interès %s i tots els seus fills?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Elimina l'adreça d'interès"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Adreces d'interès"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Edita una entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nom de l'ordinador:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directori remot:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directori local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Compte:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Entra com a anònim"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancel·la  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fitxer/_Carpeta nova..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fitxer/_Element nou..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fitxer/_Suprimeix"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fitxer/_Propietats..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Tanca"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edita les adreces d'interès"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2102,91 +2077,90 @@ msgstr ""
 "Podeu ajustar els atributs dels vostres fitxers\n"
 "Nota: no tots els servidors d'ftp implementen chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Usuari"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lectura"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escriptura"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Execució"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Altres"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Esteu segur de voler suprimir %ld fitxers i %ld directoris?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Esteu segur de voler suprimir aquests %ld fitxers?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Esteu segur de voler suprimir aquests %ld directoris?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Suprimeix fitxers/directoris"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connecta"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "S'ha rebut la URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrossegar i deixar anar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Surt"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2194,471 +2168,458 @@ msgstr ""
 "Hi ha transferències de fitxers en progrés.\n"
 "Esteu segur de voler sortir?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Obre ubicacions"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduïu la URL a on connectar-vos"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Finestra _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Finestra _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binari"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferències..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Surt"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Obre una ubicació..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_esconnecta"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Can_via el camí..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/Mostra la _selecció"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Seleccion_a-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Selecciona tots els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselecciona-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Desa el llistat del directori..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Envia una ordre SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Canvia de directori"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Fitxer/_Carpeta nova..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Canvia el _nom..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Suprimeix..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edita..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Visualitza..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Actualitza"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remot"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remot/_Obre una ubicació..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remot/D_esconnecta"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remot/sep"
 
 # FIXME
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remot/Can_via el camí..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remot/Mostra la _selecció"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remot/Seleccion_a-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remot/Selecciona tots els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remot/Deselecciona-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remot/Desa el llistat del directori..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remot/Envia una ordre SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remot/_Canvia de directori"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remot/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remot/_Carpeta nova..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remot/Canvia el _nom..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remot/_Suprimeix..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remot/_Edita..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remot/_Visualitza..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remot/_Actualitza"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Adreces d'interès"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Adreces d'interès/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Adreces d'interès/_Afegeix una adreça d'interès"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Adreces d'interès/Edita les adreces d'interès"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Adreces d'interès/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferències"
 
 # FIXME
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferències/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferències/_Inicia"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferències/A_tura"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferències/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferències/_Omet el fitxer actual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferències/_Suprimeix el fitxer"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferències/Mou el fitxer cap amunt"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferències/Mou el fitxer cap avall"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferències/_Descarrega els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferències/_Puja els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Re_gistre"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Registre/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Registre/_Neteja"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Registre/_Visualitza"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Registre/_Desa el registre..."
 
 # Accelerador a la "i" com en el mozilla
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/E_ines"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Eines/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Eines/_Compara les finestres"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Eines/_Neteja la memòria cau"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Ajuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ajuda/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Ordinador: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Ordinador: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Usuari: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Usuari: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Contrasenya: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Ordre: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nom de fitxer"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributs"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progrés"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Error: heu d'introduir l'ordinador on connectar-vos\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Refresca"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduïu el nom d'usuari:"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Introduïu el nom d'usuari per a aquest lloc"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Introduïu la contrasenya per a aquest lloc"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "S'ha cancel·lat l'operació... heu d'introduir una cadena de text\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Crea un directori"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduïu el nom del directori a crear"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Quin nom voleu posar a %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introduïu l'ordre específica del lloc remot"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Posa-hi SITE abans"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Omès"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "S'està esperant..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Reprèn"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Omet"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acció"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferència de fitxers"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2666,62 +2627,62 @@ msgstr ""
 "Aquests fitxers existeixen tant a l'ordinador local com al remot\n"
 "Escolliu el que vulgueu fer"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Omet el fitxer"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselecciona-ho tot"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Canvia la màscara: s'ha cancel·lat l'operació... heu d'introduir una cadena "
 "de text\n"
 
 # FIXME
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Canvia la màscara"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduïu la màscara nova"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Error: no s'ha pogut obrir %s per a l'escriptura: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Desa el llistat del directori"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Error: s'ha produït un error en escriure a %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "S'ha desat el registre a %s amb èxit\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Desa el registre"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2730,11 +2691,11 @@ msgstr ""
 "No s'ha pogut trobar el fitxer de la llicència (COPYING). Assegureu-vos de "
 "que és a %s o a %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Quant al gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2745,27 +2706,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Pàgina oficial: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Quant a"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acord de llicència"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Tanca  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compara les finestres"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desconnecta del servidor remot"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2773,73 +2730,57 @@ msgstr ""
 "Connecta a l'ordinador indicat. Si l'entrada és en blanc, es presentarà un "
 "diàleg que us permetrà introduir una URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (encauat) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "No connectat"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "S'ha produït un error en obrir el fitxer %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: no s'està connectat a cap lloc remot\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 "%s: aquesta característica no està disponible si s'empra aquest protocol\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: heu de tenir només un element seleccionat\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: heu de tenir com a mínim un element seleccionat\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Canvia"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Afegeix"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sí  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  No  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "S'estan obtenint els llistats dels directoris"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Atura  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2848,109 +2789,89 @@ msgstr ""
 "S'han rebut %ld directoris\n"
 "i %ld fitxers"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Error del gFTP: no s'ha pogut trobar el fitxer %s a %s ni a %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Edita l'ordinador"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Afegeix un ordinador"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipus:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domini"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adreça de xarxa"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "A_dreça de xarxa:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Màscara de xarxa"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Màscara de _xarxa:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domini:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Ordinadors locals"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Edita"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Edita"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opcions"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplica"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "S'estan rebent els noms dels fitxers..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Envia els fitxers: no s'està connectat a cap lloc remot\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Error: el fill %d ha retornat %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "El fill %d ha retornat amb èxit\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Error: el fill %d no ha acabat correctament\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Error: no s'ha pogut obtenir informació sobre el fitxer %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "No s'ha canviat el fitxer %s\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2959,122 +2880,173 @@ msgstr ""
 "El fitxer %s ha canviat.\n"
 "Voleu pujar-lo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Edita el fitxer"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Acabat"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "S'han enviat %s de %s a %.2fKB/s, temps restant: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "S'han rebut %s de %s a %.2fKB/s, temps restant: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "S'han enviat %s de %s, la transferència està embussada, es desconeix el "
 "temps restant"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "S'han rebut %s de %s, la transferència està embussada, es desconeix el temps "
 "restant"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Es desconeix el percentatge completat. (Fitxer %ld de %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% complet, %02d:%02d:%02d temps restant estimat (fitxer %ld de %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "S'estan obtenint els noms dels fitxers...%s bytes"
 
-#: ../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
+#: 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 "No hi ha cap transferència seleccionada\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visualitza"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edita"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Visualitza: %s és un directori. No es pot visualitzar.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Edita: %s és un directori. No es pot editar.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Edita: heu d'especificar un editor al diàleg d'opcions\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Visualitza: no s'ha pogut crear un altre procés: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "S'està executant el programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "S'està obrint %s amb %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "S'està visualitzant el fitxer %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Visualitza: no s'ha pogut obrir el fitxer %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "No s'ha pogut obrir el terminal controlador %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nom d'usuari [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ja existeix. (%s mida origen, %s mida destí):\n"
 "s(o)breescriu, (r)eprèn, (s)alta, S(O)breescriu-ho tot, (R)eprèn-ho tot, (S)"
 "alta-ho tot: (%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 ""
+#~ ">. Si teniu preguntes, comentaris, o suggeriments sobre aquest programa, "
+#~ "escriviu-me un correu electrònic. Podeu trobar les darreres notícies "
+#~ "quant al gFTP a la web http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancel·la  "
+
+#~ msgid "Host: "
+#~ msgstr "Ordinador: "
+
+#~ msgid "User: "
+#~ msgstr "Usuari: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Tanca  "
+
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Sí  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipus:"
+
+#~ msgid "Network Address"
+#~ msgstr "Adreça de xarxa"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edita"
+
+#~ msgid "Apply"
+#~ msgstr "Aplica"
+
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr ""
 #~ "S'ha produït un error en convertir a UTF-8 la cadena '%s' codificada "
@@ -3082,8 +3054,8 @@ msgstr ""
 
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en convertir a la localització actual la cadena '%"
-#~ "s' codificada en UTF-8: %s\n"
+#~ "S'ha produït un error en convertir a la localització actual la cadena "
+#~ "'%s' codificada en UTF-8: %s\n"
 
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr ""
diff --git a/po/ca valencia po b/po/ca valencia po
index c5f812c..08ff305 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -5,50 +5,49 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-04-11 08:30+0200\n"
 "Last-Translator: Josep Puigdemont <josep puigdemont gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
+"Language: ca valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "L'URL %s no és vàlida\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Error: la línia %s del fitxer d'índex de la memòria cau no és vàlida\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Error: no s'ha pogut crear el directori %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error: no s'ha pogut crear el fitxer temporal: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "S'ha produït un error en tancar el descriptor de fitxer: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Error: no s'ha pogut cercar dins del fitxer %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -56,61 +55,61 @@ msgstr ""
 "S'ha produït un error en convertir la cadena «%s» del joc de caràcters %s al "
 "joc de caràcters %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error: no s'ha pogut obrir el fitxer local %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Error: no s'ha pogut escriure al sòcol: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Error: no s'ha pogut llegir del sòcol: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 "Error del gFTP: el nom del fitxer d'adreces d'interés %s no és correcte\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Avís: no s'ha pogut trobar el fitxer d'adreces d'interés mestre %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr ""
 "Error del gFTP: no s'ha pogut obrir el fitxer d'adreces d'interés %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Avís del gFTP: s'ha omés la línia %d del fitxer d'adreces d'interés: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Avís del gFTP: la línia %d no té prou arguments\n"
 
-#: ../lib/config_file.c:504
+#: 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 ""
-"Esta secció especifica quins ordinadors estan a la xarxa local i no han "
-"de passar pel servidor intermediari (si està disponible). Sintaxi: "
+"Esta secció especifica quins ordinadors estan a la xarxa local i no han de "
+"passar pel servidor intermediari (si està disponible). Sintaxi: "
 "dont_use_proxy=.domini o dont_use_proxy=nombre de xarxa/màscara de xarxa"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -118,55 +117,55 @@ msgstr ""
 "ext=extensió:fitxer XPM:Ascii o Binari (A o B):programa de visualització. "
 "Nota: tots els arguments menys l'extensió són opcionals"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Error del gFTP: el nom del fitxer de configuració %s no és correcte\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Error del gFTP: no s'ha pogut crear el directori %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Error del gFTP: no s'ha pogut trobar el fitxer de configuració mestre %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ja heu fet make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Error del gFTP: no s'ha pogut obrir el fitxer de configuració %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "S'està finalitzant atès que s'han produït errors d'anàlisi a la línia %d del "
 "fitxer de configuració.\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Avís del gFTP: s'ometrà la línia %d del fitxer de configuració: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Error del gFTP: el nom del fitxer de registre %s no és correcte\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Avis del gFTP: no s'ha pogut obrir %s per a l'escriptura: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -175,20 +174,19 @@ msgstr ""
 "<masneyb gftp org>. Avís: se sobreescriurà qualsevol comentari que "
 "s'afegisca a este fitxer"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"Nota: les contrasenyes d'este fitxer estan barrejades. Este algoritme no "
-"és segur, només és per tal de que les contrasenyes siguen difícils de "
-"recordar per algú que puguera estar mirant la vostra pantalla mentre editeu "
-"este fitxer. Abans d'això, totes les contrasenyes es desaven en text "
-"normal."
+"Nota: les contrasenyes d'este fitxer estan barrejades. Este algoritme no és "
+"segur, només és per tal de que les contrasenyes siguen difícils de recordar "
+"per algú que puguera estar mirant la vostra pantalla mentre editeu este "
+"fitxer. Abans d'això, totes les contrasenyes es desaven en text normal."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -199,97 +197,96 @@ msgstr ""
 "s'afegisca a este fitxer. Si l'entrada té un (*) al comentari, no podreu "
 "canviar-la des del gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconegut>"
 
 # FIXME
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "Error FATAL de gFTP: No s'ha trobat l'opció de configuració «%s» a la taula "
 "de hash global\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error: no s'ha pogut pujar el fitxer %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error: no s'ha pogut escriure al fitxer %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error: error en tancar el fitxer %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "El llistat de fitxers del servifor FSP %s és corrupte\n"
 
-#: ../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
+#: 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 "desconegut"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "No s'ha pogut obtindre el llistat del directori FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "S'ha canviat amb èxit al directori %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "No s'ha pogut canviar al directori %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "S'ha suprimit %s amb èxit\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Error: no s'ha pogut suprimir el directori %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error: no s'ha pogut suprimir el fitxer %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "S'ha creat amb èxit el directori %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "S'ha canviat el nom de %s a %s amb èxit\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Error: no s'ha pogut canviar el nom de %s a %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -297,7 +294,7 @@ msgstr ""
 "L'FTPS no està disponible ja que no es va compilar amb SSL. S'està avortant "
 "la connexió.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -305,107 +302,105 @@ msgstr ""
 "L'HTTPS no està disponible ja que no es va compilar amb SSL. S'està avortant "
 "la connexió.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "No s'ha pogut obtindre el directori de treball actual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "S'ha canviat amb èxit el directori local a %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "No s'ha pogut canviar el directori local a %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Error: No s'ha pogut truncar el fitxer local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "No s'ha pogut obtindre el llistat del directori local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "S'ha canviat el mode de %s a %o amb èxit\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Error: no s'ha pogut canviar el mode de %s a %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "S'ha canviat amb èxit la marca de temps de %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Error: no s'ha pogut canviar la marca de temps de %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema de fitxers local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "forma d'ús: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "cap"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fitxer"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "mida"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "usuari"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grup"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datahora"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributs"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendent"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendent"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programa visualitzador:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -413,27 +408,27 @@ msgstr ""
 "El programa que s'emprarà per defecte per visualitzar fitxers. Si està buit, "
 "s'emprarà el visualitzador intern."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programa editor:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "El programa emprat per defecte per a editar fitxers."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Mida màxima de la finestra del registre:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "La mida màxima de la finestra del registre per la versió GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conjunt de caràcters remots:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -441,204 +436,208 @@ msgstr ""
 "Això és una llista de conjunts de caràcters separada per comes per intentar "
 "convertir els missatges remots al conjunt de caràcters local"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remot:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
-"Este és el valor de LC_TIME del lloc remot. Això permet analitzar les "
-"dates correctament en els llistats del directori."
+"Este és el valor de LC_TIME del lloc remot. Això permet analitzar les dates "
+"correctament en els llistats del directori."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Temps d'expiració de la memòria cau:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "El temps en segons abans que les dades de la memòria cau no expirin."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Afig transferències de fitxers"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Afig les noves transferències a les ja existents"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Fes les transferències d'una en una"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Voleu fer les transferències d'una en una?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sobreescriu per defecte"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Per defecte sobreescriure els fitxers o estableix que es reprengui la "
 "transferència de fitxers"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Conserva els permisos dels fitxers"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Conserva els permisos dels fitxers transferits"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Conserva la data dels fitxers"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Conserva la data dels fitxers transferits"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Refresca després de cada transferència de fitxers"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Refresca la llista de fitxers després de cada transferència de fitxers"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Mostra els directoris primer"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Posa els directoris davant dels fitxers"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostra els fitxers ocults"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostra els fitxers ocults a les llistes de fitxers"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostra l'estat de la transferència al títol"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostra l'estat de la transferència a la barra de títol"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Inicia la transferència de fitxers"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Inicia automàticament la transferència de fitxers quan es posen a la cua"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permet ordes manuals a la GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permet introduir ordes manualment a la GUI (funcions com en la versió de "
 "text)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Recorda el darrer directori"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Alça els darrers directoris local i remot quan l'aplicació es tanque"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Connecta al servidor remot en iniciar"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Connecta automàticament al servidor remot quan s'inicie l'aplicació."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Temps d'espera de la xarxa:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "El temps d'espera per entrada/eixida de xarxa. No és un temps d'inactivitat."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Intents de connexió:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "El nombre d'intents de connexió. Si és 0 s'anirà intentant infinitament"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Temps d'espera entre intents:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "El nombre de segons a esperar entre intents de reconnexió"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KB/s màxim:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "El màxim de KB/s que una transferència pot tindre. (Establiu-lo a 0 per "
 "desactivar)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Mida del bloc de transferència:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "La mida del bloc de transfarència s'utilitza en transferir fitxers. Ha de "
 "ser un múltiple de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocol per defecte:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Especifica el protocol a emprar per defecte"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Permet l'ús d'IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -646,27 +645,27 @@ msgstr ""
 "Això defineix el que passarà en fer doble clic en un fitxer de la llista de "
 "fitxers. 0=Mostra el fitxer 1=Edita el fitxer 2=Transfereix el fitxer"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "L'amplada per defecte de la llista de fitxers local"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "L'amplada per defecte de la llista de fitxers remota"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "L'alçària per defecte de les llistes de fitxers remota/local"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "L'alçària per defecte de la llista de transferències"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "L'alçària per defecte de la finestra del registre"
 
-#: ../lib/options.h:177
+#: 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."
@@ -674,15 +673,15 @@ msgstr ""
 "L'amplada de la columna del nom de fitxer a la finestra de transferència. "
 "Establiu-la a 0 perquè la columna es redimensioni automàticament."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "La columna que s'utilitzarà per ordenar per defecte"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordena ascendent o descendentment"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -691,43 +690,43 @@ msgstr ""
 "la a 0 perquè es redimensioni automàticament. Establiu-la a -1 per "
 "inhabilitar esta columna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 "L'amplada de la columna de la mida a la llista de fitxers. Establiu-la a 0 "
-"perquè es redimenioni automàticament. Establiu-la a -1 per inhabilitar "
-"esta columna"
+"perquè es redimenioni automàticament. Establiu-la a -1 per inhabilitar esta "
+"columna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 "L'amplada de la columna de l'usuari a la llista de fitxers. Establiu-la a 0 "
-"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
-"esta columna"
+"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar esta "
+"columna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 "L'amplada de la columna del grup a la llista de fitxers. Establiu-la a 0 "
-"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
-"esta columna"
+"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar esta "
+"columna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 "L'amplada de la columna de la data a la llista de fitxers. Establiu-la a 0 "
-"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
-"esta columna"
+"perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar esta "
+"columna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -736,77 +735,77 @@ msgstr ""
 "0 perquè es redimensioni automàticament. Establiu-la a -1 per inhabilitar "
 "esta columna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "El color de les ordes que s'envien al servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "El color de les ordes que es reben del servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "El color dels missatges d'error"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "El color de la resta de missatges del registre"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Adreça d'interés"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "La transferència és passarà a %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "S'ha produït un error en establir LC_TIME a «%s». S'utilitzarà «%s»\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 "S'està carregant el llistat del directori %s de la memòria cau (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 "S'està carregant el llistat del directori %s del servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -815,113 +814,113 @@ msgstr ""
 "Avís: s'ha extret la part del camí del fitxer «%s». La part del camí extreta "
 "(%s) no coincideix amb el directori actual (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: no s'ha pogut escriure a la memòria cau: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: no s'ha pogut trobar l'adreça d'interés %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Error en l'adreça d'interés: L'adreça d'interés %s no té cap nom "
 "d'ordinador\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "El protocol «%s» no està implementat actualment.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "S'ha trobat un enllaç simbòlic recursiu %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Error: El lloc remot %s ha desconnectat. S'ha arribat al màxim de "
 "reintents... es deixarà córrer\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Error: El lloc remot %s ha desconnectat. Es reconnectarà d'ací a %d segons\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Error: No es pot establir el senyalador de tancar en executar: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "No s'ha pogut obrir el pty mestre %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "No s'ha pogut crear una parella de sòcols: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error: no s'ha pogut executar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "No s'ha pogut crear un altre procés: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nom del servidor intermediari:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nom del tallafoc"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port del servidor intermediari:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port del tallafoc a on connectar"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nom d'usuari al servidor intermediari:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "El vostre nom d'usuari al tallafoc"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Contrasenya del servidor intermediari:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "La vostra contrasenya al tallafoc"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Empra HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Voleu emprar HTTP/1.1 o HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -930,66 +929,66 @@ msgstr ""
 "S'ha rebut una resposta incorrecta del servidor, s'està desconnectant\n"
 "El servidor remot ha retornat una mida de paquet invàlida «%s»\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "S'està desconnectant de %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "S'està iniciant la transferència del fitxer pel punt "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "No s'ha pogut obtindre el fitxer %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "S'està obtenint el llistat del directori...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 "S'ha rebut una resposta incorrecta del servidor, s'està desconnectant\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Orde SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "usuari ordinador"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "usuari ordinador:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICA"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "usuari ordinador port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "usuari ordinador NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Servidor intermediari HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -997,19 +996,19 @@ msgstr ""
 "Esta és la contrasenya que s'emprarà per entrar anònimament a un servidor "
 "FTP remot"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Compte al servidor intermediari:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "El vostre compte al tallafoc (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipus de servidor intermediari:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1027,11 +1026,11 @@ msgstr ""
 "(compte). Per exemple, per especificar l'usuari al servidor intermediari, "
 "hauríeu d'escriure %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignora l'adreça PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1043,11 +1042,11 @@ msgstr ""
 "proporcionen la seua adreça interna enlloc de la seua adreça IP externa en "
 "una resposta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferència de fitxers passiva"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1062,11 +1061,11 @@ msgstr ""
 "no ho implemente. Si està desactivat, llavors el gFTP obrirà un port a la "
 "banda del client i el servidor remot s'hi intentarà connectar."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resol els enllaços simbòlics remots (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1078,356 +1077,348 @@ msgstr ""
 "només voldreu desactivar això en cas que el servidor FTP remot no implemente "
 "l'opció -L a LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transfereix els fitxers en mode ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 "Si esteu transferint un fitxer de text de Windows a UNIX, o viceversa, "
-"llavors hauríeu d'activar esta opció. Cada sistema representa els salts "
-"de línia de forma diferent en els fitxers de text. Si esteu transferint de "
-"UNIX a UNIX, és segur tindre-ho desactivat. Si esteu descarregant dades "
-"binàries, és millor que ho tingueu desactivat."
+"llavors hauríeu d'activar esta opció. Cada sistema representa els salts de "
+"línia de forma diferent en els fitxers de text. Si esteu transferint de UNIX "
+"a UNIX, és segur tindre-ho desactivat. Si esteu descarregant dades binàries, "
+"és millor que ho tingueu desactivat."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "S'ha rebut una resposta no vàlida '%c' del servidor.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "No s'ha pogut crear un sòcol IPv4: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "No s'ha trobat cap adreça IP a la resposta de PASV «%s»\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
-"S'ignorarà l'adreça IP de la resposta PASV, s'està connectant a %d.%d.%d.%d:%"
-"d\n"
+"S'ignorarà l'adreça IP de la resposta PASV, s'està connectant a %d.%d.%d.%d:"
+"%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "No s'ha pogut crear una connexió de dades: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "No s'ha pogut obtindre el nom del sòcol: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "No s'ha pogut fer vincular a un port: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "No s'ha pogut escoltar el port %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "No s'ha pogut crear un sòcol IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
-"Error: No pareix que estiguem connectats a través d'IPv6. S'està avortant "
-"la connexió.\n"
+"Error: No pareix que estiguem connectats a través d'IPv6. S'està avortant la "
+"connexió.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "La resposta EPSV «%s» no és vàlida\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "No s'ha pogut obtindre l'adreça del sòcol local: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "No s'ha pogut acceptar la connexió del servidor: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Avís: No s'ha pogut analitzar el llistat %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "S'està cercant %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "No s'ha pogut trobar %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "No s'ha pogut crear un sòcol: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "S'està intentant amb %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "No s'ha pogut connectar a %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "S'ha connectat a %s:%d\n"
 
 # FIXME "/etc/services"
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "No s'ha pogut trobar el nom del servei %s/tcp. Comproveu el fitxer /etc/"
 "services\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "La connexió a %s ha expirat\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "No s'han pogut obtindre els senyaladors del sòcol: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "El sòcol no s'ha pogut establir a no-blocant: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nom del programa SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "La ruta a l'executable SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Paràmetres SSH extra:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Paràmetres extra que es passaran al programa SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Cal un usuari/contrasenya SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Demana un nom d'usuari/contrasenya per a connexions SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "S'està executant el programa %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Entreu la contrasenya per a la clau RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Entreu la contrasenya per a la clau '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "contrasenya"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(sí/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Entreu la contrasenya:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduïu la contrasenya SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Error: S'ha introduït una contrasenya incorrecta\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialització del protocol\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versió %d del protocol\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Obri %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Tanca\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Obri el directori %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Llig el directori\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Elimina el fitxer %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Crea el directori %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Elimina el directori %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Camí real %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributs del fitxer\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "D'acord"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Este fitxer o directori no existeix."
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Ha fallat"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Missatge incorrecte"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Sense connexió"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "S'ha perdut la connexió"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "L'operació no està implementada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "El servidor ha retornat un missatge desconegut"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Error: La mida (%d) del missatge és massa gran\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Error: La mida (%d) del missatge del servidor és massa gran\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1435,41 +1426,41 @@ msgstr ""
 "S'ha produït un error en iniciar una connexió SSH amb el servidor remot. "
 "Este és el missatge d'error del servidor remot:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "S'està obrint una connexió SSH a %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "S'ha entrat amb èxit al servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Fitxer d'entropia SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Fitxer d'entropia SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Longitud de la llavor d'entropia:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "El nombre màxim de bytes a donar a la llavor del motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verifica l'altra part SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1482,11 +1473,11 @@ msgstr ""
 "Assumpte = %s\n"
 "Error %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "No es pot obtindre el certificat de l'altra part\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1495,47 +1486,47 @@ msgstr ""
 "Error: L'ordinador al certificat SSL (%s) no concorda amb el que s'ha "
 "connectat (%s). S'està avortant la connexió.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "No s'ha pogut iniciar la biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "S'ha produït un error en carregar els certificats SSL per defecte\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "S'ha produït un error en establir la llista de codis (no hi ha codis "
 "vàlids)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Error: El motor SSL no ha estat inicialitzat\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "S'ha produït un error em establir la connexió SSL (objecte BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "S'ha produït un error en establir la connexió SSL (objecte SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "S'ha produït un error en el certificat de l'altra part: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "S'ha cancel·lat l'operació\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "S'esperaran %d segons abans d'intentar connectar un altre cop\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1545,76 +1536,76 @@ msgstr ""
 "fitxer COPYING. Això és programari lliure, i podeu redistribuir-lo sota "
 "certes condicions; per a més detalls, consulteu el fitxer COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Traduït per Josep Puigdemont <josep puigdemont gmail com>, i Albert Astals "
 "Cid <astals11 terra es>"
 
-#: ../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
+#: 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 "Error: no esteu connectat a cap lloc remot\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "forma d'ús: chmod <mode> <fitxer>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "forma d'ús: rename <nom antic> <nom nou>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "forma d'ús: delete <fitxer>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "forma d'ús: rmdir <directori>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "forma d'ús: site <orde remota>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "forma d'ús: mkdir <directori nou>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "forma d'ús: chdir <directori>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "L'argument no és vàlid\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Neteja el directori de la memòria cau\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "forma d'ús: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "forma d'ús: set [variable = valor]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Error: la variable %s no és una variable de configuració vàlida.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr ""
 "Error: la variable %s no està disponible en la versió de text del gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1622,287 +1613,287 @@ msgstr ""
 "Ordes implementades:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "forma d'ús: %s <màscara>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Mostra informació  quant al gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Estableix el mode de transmissió de fitxers a ascii (només per a FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Estableix el mode de transmissió de fitxers a binari (només per a FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Canvia el directori de treball remot"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Canvia els permisos d'un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opcions disponibles: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desconnecta del lloc remot"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Suprimeix un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Mostra la llista de fitxers del directori remot actual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Descarrega fitxers remots"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Mostra esta finestra d'ajuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Canvia el directori de treball local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Canvia els permisos d'un fitxer local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Suprimeix un fitxer local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Mostra la llista de fitxers del directori local actual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crea un directori local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Mostra el directori local actual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Canvia el nom d'un fitxer local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Suprimeix un directori local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crea un directori remot"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Puja fitxers locals"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Obri una connexió a un lloc remot"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Mostra el directori remot actual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Ix del gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Canvia el nom d'un fitxer remot"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Suprimeix un directori remot"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Mostra les variables del fitxer de configuració. També es poden establir "
 "variables amb «set var=val»"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Executa una orde específica del lloc remot"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Error: no s'ha reconegut l'orde\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "S'ha transferit %s amb èxit a %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "S'està ometent el fitxer %s de l'ordinador %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "S'està aturant la transferència de l'ordinador %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "No s'ha pogut descarregar %s de %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1911,39 +1902,37 @@ msgstr ""
 "No s'han pogut transferir %d fitxers o directoris. Comproveu el registre per "
 "saber els elements que no s'han transferit."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: premeu el botó d'aturar abans de fer res més\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Executa una adreça d'interés"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
-"Afig una adreça d'interés: heu d'introduir un nom per a l'adreça "
-"d'interés\n"
+"Afig una adreça d'interés: heu d'introduir un nom per a l'adreça d'interés\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
-"Afig una adreça d'interés: no es pot afegir l'adreça d'interés %s perquè "
-"ja n'hi ha una amb este nom\n"
+"Afig una adreça d'interés: no es pot afegir l'adreça d'interés %s perquè ja "
+"n'hi ha una amb este nom\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Afig una adreça d'interés"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Afig una adreça d'interés: heu d'introduir un nom d'ordinador\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1953,31 +1942,31 @@ msgstr ""
 "Podeu separar els elements amb / per a introduir l'adreça\n"
 "d'interés a un submenú (p.ex.: Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Recorda la contrasenya"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Heu d'indicar el nom per a l'adreça d'interés."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Carpeta nova"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduïu el nom de la carpeta nova a crear"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Element nou"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduïu el nom de l'element nou a crear"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1986,106 +1975,99 @@ msgstr ""
 "Esteu segur de voler eliminar l'adreça\n"
 "d'interés %s i tots els seus fills?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Elimina l'adreça d'interés"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Adreces d'interés"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Edita una entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nom de l'ordinador:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directori remot:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directori local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Compte:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Entra com a anònim"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancel·la  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fitxer/_Carpeta nova..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fitxer/_Element nou..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fitxer/_Suprimeix"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fitxer/_Propietats..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Tanca"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edita les adreces d'interés"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2093,91 +2075,90 @@ msgstr ""
 "Podeu ajustar els atributs dels vostres fitxers\n"
 "Nota: no tots els servidors d'ftp implementen chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Usuari"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lectura"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escriptura"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Execució"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Altres"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Esteu segur de voler suprimir %ld fitxers i %ld directoris?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Esteu segur de voler suprimir estos %ld fitxers?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Esteu segur de voler suprimir estos %ld directoris?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Suprimeix fitxers/directoris"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connecta"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "S'ha rebut la URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrossegar i deixar anar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Ix"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2185,471 +2166,458 @@ msgstr ""
 "Hi ha transferències de fitxers en progrés.\n"
 "Esteu segur de voler eixir?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Obri ubicacions"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduïu la URL a on connectar-vos"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Finestra _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Finestra _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binari"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferències..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/I_x"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Obri una ubicació..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_esconnecta"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Can_via el camí..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/Mostra la _selecció"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Seleccion_a-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Selecciona tots els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselecciona-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Alça el llistat del directori..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Envia una orde SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Canvia de directori"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Fitxer/_Carpeta nova..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Canvia el _nom..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Suprimeix..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edita..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Visualitza..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Actualitza"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remot"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remot/_Obri una ubicació..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remot/D_esconnecta"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remot/sep"
 
 # FIXME
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remot/Can_via el camí..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remot/Mostra la _selecció"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remot/Seleccion_a-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remot/Selecciona tots els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remot/Deselecciona-ho tot"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remot/Alça el llistat del directori..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remot/Envia una orde SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remot/_Canvia de directori"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remot/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remot/_Carpeta nova..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remot/Canvia el _nom..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remot/_Suprimeix..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remot/_Edita..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remot/_Visualitza..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remot/_Actualitza"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Adreces d'interés"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Adreces d'interés/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Adreces d'interés/_Afig una adreça d'interés"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Adreces d'interés/Edita les adreces d'interés"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Adreces d'interés/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferències"
 
 # FIXME
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferències/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferències/_Inicia"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferències/A_tura"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferències/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferències/_Omet el fitxer actual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferències/_Suprimeix el fitxer"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferències/Mou el fitxer cap amunt"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferències/Mou el fitxer cap avall"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferències/_Descarrega els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferències/_Puja els fitxers"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Re_gistre"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Registre/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Registre/_Neteja"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Registre/_Visualitza"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Registre/Al_ça el registre..."
 
 # Accelerador a la "i" com en el mozilla
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/E_ines"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Eines/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Eines/_Compara les finestres"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Eines/_Neteja la memòria cau"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Ajuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ajuda/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Ordinador: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Ordinador: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Usuari: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Usuari: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Contrasenya: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Orde: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nom de fitxer"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributs"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progrés"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Error: heu d'introduir l'ordinador on connectar-vos\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Refresca"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduïu el nom d'usuari:"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Introduïu el nom d'usuari per a este lloc"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Introduïu la contrasenya per a este lloc"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "S'ha cancel·lat l'operació... heu d'introduir una cadena de text\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Crea un directori"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduïu el nom del directori a crear"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Quin nom voleu posar a %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introduïu l'orde específica del lloc remot"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Posa-hi SITE abans"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Omés"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "S'està esperant..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Reprén"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Omet"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acció"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferència de fitxers"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2657,62 +2625,62 @@ msgstr ""
 "Estos fitxers existeixen tant a l'ordinador local com al remot\n"
 "Escolliu el que vulgueu fer"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Omet el fitxer"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselecciona-ho tot"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Canvia la màscara: s'ha cancel·lat l'operació... heu d'introduir una cadena "
 "de text\n"
 
 # FIXME
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Canvia la màscara"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduïu la màscara nova"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Error: no s'ha pogut obrir %s per a l'escriptura: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Alça el llistat del directori"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Error: s'ha produït un error en escriure a %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "S'ha alçat el registre a %s amb èxit\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Alça el registre"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2721,11 +2689,11 @@ msgstr ""
 "No s'ha pogut trobar el fitxer de la llicència (COPYING). Assegureu-vos de "
 "que és a %s o a %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Quant al gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2736,27 +2704,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Pàgina oficial: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Quant a"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acord de llicència"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Tanca  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compara les finestres"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desconnecta del servidor remot"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2764,73 +2728,56 @@ msgstr ""
 "Connecta a l'ordinador indicat. Si l'entrada és en blanc, es presentarà un "
 "diàleg que vos permetrà introduir una URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (encauat) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "No connectat"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "S'ha produït un error en obrir el fitxer %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: no s'està connectat a cap lloc remot\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
-msgstr ""
-"%s: esta característica no està disponible si s'empra este protocol\n"
+msgstr "%s: esta característica no està disponible si s'empra este protocol\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: heu de tindre només un element seleccionat\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: heu de tindre com a mínim un element seleccionat\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Canvia"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Afig"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sí  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  No  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "S'estan obtenint els llistats dels directoris"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Atura  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2839,109 +2786,89 @@ msgstr ""
 "S'han rebut %ld directoris\n"
 "i %ld fitxers"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Error del gFTP: no s'ha pogut trobar el fitxer %s a %s ni a %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Edita l'ordinador"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Afig un ordinador"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipus:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domini"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adreça de xarxa"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "A_dreça de xarxa:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Màscara de xarxa"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Màscara de _xarxa:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domini:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Ordinadors locals"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Edita"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Edita"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opcions"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplica"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "S'estan rebent els noms dels fitxers..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Envia els fitxers: no s'està connectat a cap lloc remot\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Error: el fill %d ha retornat %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "El fill %d ha retornat amb èxit\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Error: el fill %d no ha acabat correctament\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Error: no s'ha pogut obtindre informació sobre el fitxer %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "No s'ha canviat el fitxer %s\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2950,122 +2877,161 @@ msgstr ""
 "El fitxer %s ha canviat.\n"
 "Voleu pujar-lo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Edita el fitxer"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Acabat"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "S'han enviat %s de %s a %.2fKB/s, temps restant: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "S'han rebut %s de %s a %.2fKB/s, temps restant: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "S'han enviat %s de %s, la transferència està embussada, es desconeix el "
 "temps restant"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "S'han rebut %s de %s, la transferència està embussada, es desconeix el temps "
 "restant"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Es desconeix el percentatge completat. (Fitxer %ld de %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% complet, %02d:%02d:%02d temps restant estimat (fitxer %ld de %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "S'estan obtenint els noms dels fitxers...%s bytes"
 
-#: ../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
+#: 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 "No hi ha cap transferència seleccionada\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visualitza"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edita"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Visualitza: %s és un directori. No es pot visualitzar.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Edita: %s és un directori. No es pot editar.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Edita: heu d'especificar un editor al diàleg d'opcions\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Visualitza: no s'ha pogut crear un altre procés: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "S'està executant el programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "S'està obrint %s amb %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "S'està visualitzant el fitxer %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Visualitza: no s'ha pogut obrir el fitxer %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "No s'ha pogut obrir el terminal controlador %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nom d'usuari [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ja existeix. (%s mida origen, %s mida destí):\n"
 "s(o)breescriu, (r)eprèn, (s)alta, S(O)breescriu-ho tot, (R)eprèn-ho tot, (S)"
 "alta-ho tot: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancel·la  "
+
+#~ msgid "Host: "
+#~ msgstr "Ordinador: "
+
+#~ msgid "User: "
+#~ msgstr "Usuari: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Tanca  "
+
+#~ msgid "Add"
+#~ msgstr "Afig"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Sí  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipus:"
+
+#~ msgid "Network Address"
+#~ msgstr "Adreça de xarxa"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edita"
+
+#~ msgid "Apply"
+#~ msgstr "Aplica"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
@@ -3085,8 +3051,8 @@ msgstr ""
 
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en convertir a la localització actual la cadena '%"
-#~ "s' codificada en UTF-8: %s\n"
+#~ "S'ha produït un error en convertir a la localització actual la cadena "
+#~ "'%s' codificada en UTF-8: %s\n"
 
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 1da7abc..33d8b36 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,100 +9,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gFTP master\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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-02-01 12:28+0100\n"
 "Last-Translator: Marek Černocký <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Neplatná adresa URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Chyba: Neplatný řádek %s v indexovém souboru mezipaměti\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Chyba: Nelze vytvořit složku %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Chyba: Nelze vytvořit dočasný soubor: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Chyba při zavírání popisovače souboru: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Chyba: Nelze nastavit pozici v souboru %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr ""
 "Chyba při převodu řetězce „%s“ ze znakové sady %s do znakové sady %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Chyba: Nelze otevřít místní soubor %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Chyba: Nelze zapisovat do soketu: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Chyba: Nelze číst ze soketu: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Chyba gFTP: Špatný název souboru záložek %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Varování: Nelze najít hlavní soubor záložek %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Chyba gFTP: Nelze otevřít soubor záložek %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Varování gFTP: Vynechává se řádek %d v souboru záložek: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Varování gFTP: Řádek %d nemá dost argumentů\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -112,7 +110,7 @@ msgstr ""
 "proxy server (pokud je k dispozici). Syntaxe: dont_use_proxy=.doména nebo "
 "dont_use_proxy=číslo sítě/maska sítě"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -120,56 +118,52 @@ msgstr ""
 "ext=přípona souboru:soubor XPM:ASCII nebo Binární (A nebo B):prohlížecí "
 "program. Poznámka: Všechny argumenty kromě přípony souboru jsou nepovinné"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Chyba gFTP: Špatný název souboru nastavení %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Chyba gFTP: Nelze vytvořit složku %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Chyba gFTP: Nelze najít hlavní soubor nastavení %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Provedli jste „make install“?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Chyba gFTP: Nelze otevřít soubor nastavení %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Končí se kvůli chybách při analýze řádku %d souboru nastavení\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Varování gFTP: Vynechává se řádek %d v souboru nastavení: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Chyba gFTP: Špatný název souboru se záznamem %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Varování gFTP: Nelze otevřít %s pro zápis: %s\n"
 
-#: ../lib/config_file.c:732
-#| msgid ""
-#| "Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney "
-#| "<masneyb gftp org>. Warning: Any comments that you add to this file WILL "
-#| "be overwritten"
+#: 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"
@@ -178,7 +172,7 @@ msgstr ""
 "org>. Varování: Veškeré komentáře, které přidáte do tohoto souboru, BUDOU "
 "přepsány"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -190,12 +184,7 @@ msgstr ""
 "někdo, kdo vám stojí za zády, když upravujete tento soubor. Dříve byla "
 "všechna hesla ukládána čistě textově."
 
-#: ../lib/config_file.c:845
-#| msgid ""
-#| "Config file for gFTP. Copyright (C) 1998-2003 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"
+#: 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. "
@@ -205,96 +194,95 @@ msgstr ""
 "org> Varování: Veškeré komentáře, které přidáte do tohoto souboru, BUDOU "
 "přepsány. Pokud má položka ve svém komentáři (*), nemůžete ji změnit v gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<neznámý>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "FATÁLNÍ chyba gFTP: Volba nastavení „%s“ nebyla nenalezena v globální "
 "hašovací tabulce\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Chyba: Nelze odeslat soubor %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Chyba: Nelze zapisovat do souboru %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Chyba: Chyba při zavírání souboru: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Poškozený seznam souborů od serveru FSP %s\n"
 
-#: ../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
+#: 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 "neznámý"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nelze získat výpis složky FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Úspěšně změněna složka na %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nelze změnit složku na %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Úspěšně odstraněno %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Chyba: Nelze odstranit složku %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Chyba: Nelze odstranit soubor %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Úspěšně vytvořena složka %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Úspěšně přejmenováno %s na %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Chyba: Nelze přejmenovat %s na %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -302,7 +290,7 @@ msgstr ""
 "Podpora FTPS není k dispozici, protože podpora SSL nebyla zakompilována. "
 "Přerušuje se spojení.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -310,109 +298,105 @@ msgstr ""
 "Podpora HTTPS není k dispozici, protože podpora SSL nebyla zakompilována. "
 "Přerušuje se spojení.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nelze získat pracovní složku: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Místní složka úspěšně změněna na %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Nelze změnit místní složku na %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Chyba: Nelze zkrátit místní soubor %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nelze získat výpis místní složky %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Úspěšně změněn režim %s na %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Chyba: Nelze změnit režim %s na %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
-#| msgid "Successfully changed directory to %s\n"
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Úspěšně změněna složka na %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
-#| msgid "Error: Could not change mode of %s to %o: %s\n"
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Chyba: Nelze změnit časové razítko %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "místní systém souborů"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "použití: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "žádný"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "soubor"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "velikost"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "uživatel"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "skupina"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datum/čas"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributy"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "sestupně"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "vzestupně"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Obecné"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Prohlížecí program:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -420,27 +404,27 @@ msgstr ""
 "Výchozí program používaný k zobrazování souborů. Pokud není zadán, použije "
 "se interní prohlížeč souborů"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Editační program:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Výchozí program používaný k úpravě souborů."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maximální velikost okna se záznamem:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maximální velikost okna se záznamem v bajtech pro okénko GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Vzdálené znakové sady:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -448,11 +432,11 @@ msgstr ""
 "Toto je seznam znakových sad oddělených čárkou, používaných při pokusu "
 "převést vzdálené názvy souborů do aktuálního národního nastavení"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Vzdálené LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -460,192 +444,194 @@ msgstr ""
 "Toto je hodnota LC_TIME (národní formát data a času) pro vzdálený server. Je "
 "potřeba, aby mohla být správně analyzováno datum ve výpisech složek."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL mezipaměti:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Počet sekund, po které se mají zachovat položky mezipaměti, než vyprší."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Připojovat přenosy souborů"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Připojovat nové přenosy souborů k těm existujícím"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Současně přenášet jen jeden soubor"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Přenášet současně jen jeden soubor?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Standardně přepisovat"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Standardně soubory přepisovat nebo zkusit navázat na dřívější přenos souborů"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Zachovat oprávnění souborů"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Zachovat oprávnění přenášených souborů"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Zachovat čas souborů"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Zachovat časy přenášených souborů"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Občerstvit po každém přenosu souboru"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Občerstvit pole se seznamem po přenosu každého souboru"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Složky řadit na začátek"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Složky zobrazit jako první, soubory až za nimi"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Zobrazovat skryté soubory"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Zobrazovat skryté soubory v polích se seznamy"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Zobrazovat stav přenosu v záhlaví"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Zobrazovat stav přenosu souboru v záhlaví okna"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Spouštět přenosy souborů"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Automaticky spouštět přenosy souborů, když jsou zařazeny do fronty"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Povolit ruční příkazy v grafickém uživatelském rozhraní"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Povolit ruční zadávání příkazů v grafickém uživatelském rozhraní (funguje "
 "jako textové okénko)"
 
-#: ../lib/options.h:111
-#| msgid "Remove a local directory"
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Zapamatovat poslední složku"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Uložit poslední místní a vzdálenou složku při zavírání aplikace"
 
-#: ../lib/options.h:115
-#| msgid "Disconnect from the remote server"
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Připojit ke vzdálenému serveru při spuštění"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Automaticky se připojit ke vzdálenému serveru při spuštění aplikace."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Síť"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Časový limit pro síť:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Časový limit pro čekání na vstup/výstup po síti. Toto NENÍ časový limit "
 "nečinnosti."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Opakování spojení:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Počet automatických pokusů o spojení. Pro neustálé opakování nastavte na 0."
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Opakovat spojení za:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Počet sekund čekání mezi pokusy"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max kB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Maximální rychlost v kB/s pro přenos souborů. (Vypnete nastavením na 0)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Velikost bloku při přenosu:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Velikost bloku používaná při přenosu souborů. Měla by být násobkem 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Výchozí protokol:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Tímto se určuje výchozí používaný protokol"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Zapnout podporu IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -653,27 +639,27 @@ msgstr ""
 "Definuje, co se stane, když dvakrát kliknete na soubor v polích se seznamy "
 "souborů. 0=Zobrazit soubor 1=Upravit soubor 2=Přenést soubor"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Výchozí šířka pole se seznamem místních souborů"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Výchozí šířka pole se seznamem vzdálených souborů"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Výchozí výška pole se seznamem místních/vzdálených souborů"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Výchozí výška pole se seznamem přenosů"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Výchozí výška okna se záznamem"
 
-#: ../lib/options.h:177
+#: 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."
@@ -681,15 +667,15 @@ msgstr ""
 "Šířka sloupce s názvem souboru v okně přenosu. Při nastavení na 0 bude "
 "sloupec měnit velikost automaticky."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Výchozí sloupec, podle kterého se má řadit"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Řadit vzestupně nebo sestupně"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -697,7 +683,7 @@ msgstr ""
 "Šířka sloupce s názvem souboru v poli se seznamem souborů. Při nastavení na "
 "0 bude sloupec měnit velikost automaticky. Nastavením na -1 sloupec vypnete."
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -705,7 +691,7 @@ msgstr ""
 "Šířka sloupce s velikostí v poli se seznamem souborů. Při nastavení na 0 "
 "bude sloupec měnit velikost automaticky. Nastavením na -1 sloupec vypnete."
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -714,7 +700,7 @@ msgstr ""
 "na 0 bude sloupec měnit velikost automaticky. Nastavením na -1 sloupec "
 "vypnete."
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -722,7 +708,7 @@ msgstr ""
 "Šířka sloupce s názvem skupiny v poli se seznamem souborů. Při nastavení na "
 "0 bude sloupec měnit velikost automaticky. Nastavením na -1 sloupec vypnete."
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -730,7 +716,7 @@ msgstr ""
 "Šířka sloupce s datem v poli se seznamem souborů. Při nastavení na 0 bude "
 "sloupec měnit velikost automaticky. Nastavením na -1 sloupec vypnete."
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -738,75 +724,75 @@ msgstr ""
 "Šířka sloupce s atributy v poli se seznamem souborů. Při nastavení na 0 bude "
 "sloupec měnit velikost automaticky. Nastavením na -1 sloupec vypnete."
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Barva příkazů posílaných na server"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Barva příkazů přijímaných ze serveru"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Barva chybových zpráv"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Barva ostatních zpráv v evidenci"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Místní"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Přenos souborů bude omezen na %.2f kB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Chyba při nastavování LC_TIME na „%s“. Místo toho se použije „%s“\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Načítá se výpis složky %s z mezipaměti (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Načítá se výpis složky %s ze serveru (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -815,111 +801,111 @@ msgstr ""
 "Varování: Odstraňuje se cesta ze souboru „%s“. Oříznutá cesta (%s) "
 "neodpovídá aktuální složce (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Chyba: Nelze zapisovat do mezipaměti: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Chyba: Nelze najít záložku %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Chyba záložek: Položka %s v záložkách nemá název počítače\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokol „%s“ není v současnosti podporován.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Nalezen symbolický odkaz sama na sebe %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Chyba: Vzdálený počítač %s byl odpojen. Maximální počet opakování vyčerpán… "
 "nechává se toho\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Chyba: Vzdálený počítač %s byl odpojen. Znovu bude připojen za %d sekund\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Chyba: Nelze nastavit příznak zavření při spuštění: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nelze otevřít hlavní pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nelze vytvořit pár soketů: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Chyba: Nelze spustit ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nelze vytvořit další proces: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Název počítače s proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Název počítače s firewallem"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port, přes který se má připojit k firewallu"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Jméno uživatele proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Vaše uživatelské jméno pro firewall"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Heslo proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Vaše heslo pro firewall"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Používat HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Chcete používat HTTP/1.1 nebo HTTP/1.0?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -928,65 +914,65 @@ msgstr ""
 "Přijata nesprávná odpověď od serveru, odpojuje se\n"
 "Vzdáleným serverem vrácena neplatná velikost úseku „%s“\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Odpojuje se od serveru %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Zahajuje se přenos souboru od pozice"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nelze získat soubor %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Získává se výpis složky…\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Přijata nesprávná odpověď od serveru, odpojuje se\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "příkaz SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "uživatel počítač"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "uživatel počítač:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTIZACE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "uživatel počítač port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "uživatel počítač NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-mailová adresa:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -994,19 +980,19 @@ msgstr ""
 "Toto je heslo, které bude použito, kdykoli se přihlásíte ke vzdálenému "
 "serveru FTP jako anonym"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Účet proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Váš účet na firewallu (volitelné)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Typ serveru proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1022,11 +1008,11 @@ msgstr ""
 "serveru FTP. Druhý znak může být u (uživatel), p (heslo), h (počítač), o "
 "(port) nebo a (účet). Například pro zadání uživatele proxy můžete vložit %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorovat adresu PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1037,11 +1023,11 @@ msgstr ""
 "ignorováno a bude použita adresa IP počítače. To je často potřeba pro "
 "routery, které v odpovědi na PASV dávají interní adresu IP namísto externí."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasivní přenosy souborů"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1056,11 +1042,11 @@ msgstr ""
 "který to nepodporuje. Je-li to zakázáno, otevře gFTP port na straně klienta "
 "a vzdálený server se k němu pokusí připojit."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Následovat vzdálené symbolické odkazy (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1071,15 +1057,16 @@ msgstr ""
 "Obecně je dobrý nápad nechat to povolené. Zakázat to budete chtít jen v "
 "případě, že vzdálený server FTP nepodporuje přepínač -L u příkazu LIST."
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Přenášet soubory v režimu ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1088,337 +1075,328 @@ msgstr ""
 "souborech jinak. Pokud přenášíte z UNIXu na UNIX, je bezpečné nechat to "
 "vypnuté. Pokud stahujete binární data, budete to chtít zakázat."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Od serveru přijata neplatná odpověď „%c“.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Nelze vytvořit soket IPv4: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Nelze najít adresu IP v odpovědi na PASV „%s“\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "Ignoruje se adresa IP v odpovědi na PASV, připojuje se k %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Nelze vytvořit datové spojení: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Nelze získat název soketu: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Nelze navázat port: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Nelze naslouchat na portu %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Nelze vytvořit soket IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Chyba: Nevypadá to, že se jedná o připojení přes IPv6. Přerušuje se "
 "spojení.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Neplatná odpověď EPSV „%s“\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Nelze získat adresu místního soketu: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nelze přijmout spojení od serveru: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "celkem"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Varování: Nelze analyzovat výpis %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Vyhledává se %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Nelze vyhledat název počítače %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Selhalo vytvoření soketu: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Zkouší se %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Nelze se připojit k %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Připojeno k %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Nelze vyhledat název služby %s/tcp. Zkontrolujte prosím svůj soubor "
 "„services“\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Připojení k %s vypršel časový limit\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Nelze získat příznaky soketu: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Nelze nastavit soket do neblokujícího režimu: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Název programu SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Cesta ke spustitelnému souboru SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Další parametry SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Další parametry, které se mají předat programu SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Je potřeba uživatel/heslo pro SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Vyžadovat jméno uživatele/heslo pro připojení přes SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Spouští se program: %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Zadejte heslo pro klíč RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Zadejte heslo pro klíč „"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Heslo"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "heslo"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ano/ne)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Zadejte PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Zadejte heslo SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Chyba: Bylo zadáno nesprávné heslo\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicializace protokolu\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Verze protokolu %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Otevřít %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Zavřít\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Otevřít složku %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Číst složku\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Odstranit soubor %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Vytvořit složku %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Odstranit složku %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Skutečná cesta %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributy souboru\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stav %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Změna práv %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Změnit čas přístupu %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "KONEC SOUBORU"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Takový soubor ani složka neexistuje"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Přístup odepřen"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Selhání"
 
 # :-)
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Špatná zpráva"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Žádné připojení"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Spojení ztraceno"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operace nepodporována"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Ze serveru vrácena neznámá zpráva"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Chyba: Velikost zprávy %d je příliš velká\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Chyba: Velikost zprávy ze serveru %d je příliš velká\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1426,41 +1404,41 @@ msgstr ""
 "Při inicializaci spojení SSL se vzdáleným serverem došlo k chybě. Následuje "
 "chybová zpráva od vzdáleného serveru:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Otevírá se spojení SSH s %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Úspěšně přihlášen k serveru SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Podpora SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Soubor entropie SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Soubor entropie SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Délka počátečního čísla entropie:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Maximální počet bajtů, kterými se má inicializovat podpora SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Ověřit protistranu SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1473,11 +1451,11 @@ msgstr ""
 "Předmět = %s\n"
 "Chyba %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Nelze získat certifikát protistrany\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1486,45 +1464,45 @@ msgstr ""
 "CHYBA: Počítač v certifikátu SSL (%s) neodpovídá počítači, ke kterému se "
 "vytvořilo připojení (%s). Přerušuje se spojení.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Nelze inicializovat knihovnu OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Chyba při načítání výchozích certifikátů SSL\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Chyba při získávání seznamu šifer (žádné platné šifry)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Chyba: Podpora SSL nebyla inicializována\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Chyba při vytváření spojení SSL (objekt BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Chyba při vytváření spojení SSL (objekt SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Chyba v certifikátu protistrany: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operace zrušena\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Čeká se %d sekund před dalším pokusem o připojení\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1534,75 +1512,75 @@ msgstr ""
 "Toto je svobodný software a za konkrétních podmínek jej můžete dále šířit; "
 "další podrobnosti viz soubor COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Přeložili: Domanský Petr <doman atlas cz>, Miloslav Trmač <mitr volny cz>, "
 "Marek Černocký <marek manet cz>"
 
-#: ../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
+#: 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 "Chyba: Nepřipojeno ke vzdálenému počítači\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "použití: chmod <mód> <soubor>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "použití: rename <starý název> <nový název>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "použití: delete <soubor>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "použití: rmdir <složka>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "použití: site <příkaz serveru>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "použití: mkdir <nová složka>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "použití: chdir <složka>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Neplatný argument\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Vymazat mezipaměť složek\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "použití: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "použití: set [proměnná = hodnota]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Chyba: Proměnná %s není platná proměnná nastavení.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Chyba: Proměnná %s není k dispozici v textovém okénku gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1610,287 +1588,287 @@ msgstr ""
 "Podporované příkazy:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "použití: %s <maska>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Zobrazit informace o gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Nastavit aktuální režim přenosu souborů na ASCII (jen pro FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Nastavit aktuální režim přenosu souborů na binární (jen pro FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Změnit vzdálenou pracovní složku"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Změnit oprávnění vzdáleného souboru"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Dostupné volby: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Odpojit od vzdáleného počítače"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Odstranit vzdálený soubor"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Zobrazit výpis aktuální vzdálené složky"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Stáhnout vzdálený soubor(y)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Zobrazit tuto obrazovku s nápovědou"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Změnit místní pracovní složku"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Změnit oprávnění místního souboru"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Odstranit místní soubor"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Zobrazit výpis aktuální místní složky"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Vytvořit místní složku"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Zobrazit aktuální místní složku"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Přejmenovat místní soubor"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Odstranit místní složku"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Vytvořit vzdálenou složku"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Odeslat místní soubor(y)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Otevřít spojení se vzdáleným počítačem"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Zobrazit aktuální vzdálenou složku"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Ukončit gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Přejmenovat vzdálený soubor"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Odstranit vzdálenou složku"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Zobrazit proměnné souboru nastavení. Proměnné můžete také nastavit pomocí "
 "„set proměnná=hodnota“"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Spustit příkaz specifický pro server"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Chyba: Příkaz nerozpoznán\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Úspěšně přeneseno %s rychlostí %.2f kB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Přeskakuje se soubor %s na počítači %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Zastavuje se přenos na počítači %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nelze stáhnout %s z %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1899,36 +1877,35 @@ msgstr ""
 "Nezdařilo se přenést %d souborů nebo složek. Podívejte se do záznamu, které "
 "položky nebyly správně přeneseny."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Před jinou činností nejprve prosím stiskněte tlačítko stop\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Spustit záložku"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Přidání záložky: Musíte zadat název pro záložku\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Přidání záložky: Nelze přidat záložku %s, protože tento název již existuje\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Přidat záložku"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Přidání záložky: Musíte zadat název počítače\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1938,33 +1915,31 @@ msgstr ""
 "Záložku můžete umístit do podnabídky tak, že oddělíte položky pomocí /\n"
 "(např.: Weby o Linuxu/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Pamatovat si heslo"
 
-#: ../src/gtk/bookmarks.c:420
-#| msgid "Add Bookmark: You must enter a name for the bookmark\n"
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Musíte zadat název pro záložku."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nová složka"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Zadejte název nové složky, která se má vytvořit"
 
-#: ../src/gtk/bookmarks.c:482
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nová položka"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Zadejte název nové položky, která se má vytvořit"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1973,111 +1948,99 @@ msgstr ""
 "Opravdu chcete odstranit záložku\n"
 "%s a všechny její potomky?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Odstranit záložku"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Upravit položku"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Název počítače:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Vzdálená složka:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Místní složka:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Jméno uživatele:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Účet:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Přihlásit se jako ANONYM"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Zrušit  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Soubor/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
-#| msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Soubor/Nová _složka…"
 
-#: ../src/gtk/bookmarks.c:1207
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Soubor/Nová _položka…"
 
-#: ../src/gtk/bookmarks.c:1208
-#| msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Soubor/O_dstranit"
 
-#: ../src/gtk/bookmarks.c:1209
-#| msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Soubor/_Vlastnosti…"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Soubor/sep"
 
-#: ../src/gtk/bookmarks.c:1211
-#| msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Soubor/_Zavřít"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Upravit záložky"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2085,91 +2048,90 @@ msgstr ""
 "Nyní můžete upravit atributy svých souborů\n"
 "Poznámka: Ne všechny servery FTP podporují chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciální"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Uživatel"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Čtení"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Zápis"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Spouštění"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Ostatní"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Opravdu chcete odstranit těchto %ld souborů a %ld složek"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Opravdu chcete odstranit těchto %ld souborů"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Opravdu chcete odstranit těchto %ld adresářů"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Odstranit soubory/složky"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Připojit"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Přijata adresa URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Táhni a pusť"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Konec"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2177,521 +2139,455 @@ msgstr ""
 "Probíhají přenosy souborů\n"
 "Opravdu chcete skončit?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
-#| msgid "Options"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Otevřít umístění"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Zadejte adresu URL, ke které se má připojit"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
-#| msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Okno _1"
 
-#: ../src/gtk/gftp-gtk.c:269
-#| msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Okno _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
-#| msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_ASCII"
 
-#: ../src/gtk/gftp-gtk.c:274
-#| msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binární"
 
-#: ../src/gtk/gftp-gtk.c:277
-#| msgid "/File/Properties..."
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Předvolby…"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/U_končit"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Místní"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Místní/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-#| msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Místní/_Otevřít umístění…"
 
-#: ../src/gtk/gftp-gtk.c:285
-#| msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Místní/Odpoj_it"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Místní/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
-#| msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Místní/Změnit mas_ku..."
 
-#: ../src/gtk/gftp-gtk.c:289
-#| msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Místní/Zo_brazit vybrané"
 
-#: ../src/gtk/gftp-gtk.c:290
-#| msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Místní/Vybr_at vše"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Místní/Vybrat všechny soubory"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Místní/Zrušit výběr"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Místní/Uložit výpis složky…"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Místní/Odeslat příkaz SITE…"
 
-#: ../src/gtk/gftp-gtk.c:296
-#| msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Místní/Změnit s_ložku"
 
-#: ../src/gtk/gftp-gtk.c:297
-#| msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Místní/O_právnění…"
 
-#: ../src/gtk/gftp-gtk.c:299
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Místní/_Nová složka…"
 
-#: ../src/gtk/gftp-gtk.c:300
-#| msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Místní/Přej_menovat…"
 
-#: ../src/gtk/gftp-gtk.c:302
-#| msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Místní/O_dstranit"
 
-#: ../src/gtk/gftp-gtk.c:304
-#| msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Místní/_Upravit…"
 
-#: ../src/gtk/gftp-gtk.c:305
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Místní/_Zobrazit…"
 
-#: ../src/gtk/gftp-gtk.c:306
-#| msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Místní/Obče_rstvit"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Vzdálený"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Vzdálený/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
-#| msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Vzdálený/_Otevřít umístění…"
 
-#: ../src/gtk/gftp-gtk.c:312
-#| msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Vzdálený/Odpoj_it"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Vzdálený/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
-#| msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Vzdálený/Změnit mas_ku…"
 
-#: ../src/gtk/gftp-gtk.c:317
-#| msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Vzdálený/Zo_brazit vybrané"
 
-#: ../src/gtk/gftp-gtk.c:318
-#| msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Vzdálený/Vybr_at vše"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Vzdálený/Vybrat všechny soubory"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Vzdálený/Zrušit výběr"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Vzdálený/Uložit výpis složky…"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Vzdálený/Poslat příkaz SITE…"
 
-#: ../src/gtk/gftp-gtk.c:324
-#| msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Vzdálený/Změnit s_ložku"
 
-#: ../src/gtk/gftp-gtk.c:325
-#| msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Vzdálený/O_právnění…"
 
-#: ../src/gtk/gftp-gtk.c:326
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Vzdálený/_Nová složka…"
 
-#: ../src/gtk/gftp-gtk.c:328
-#| msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Vzdálený/Přej_menovat…"
 
-#: ../src/gtk/gftp-gtk.c:330
-#| msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Vzdálený/O_dstranit…"
 
-#: ../src/gtk/gftp-gtk.c:331
-#| msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Vzdálený/_Upravit…"
 
-#: ../src/gtk/gftp-gtk.c:332
-#| msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Vzdálený/_Zobrazit…"
 
-#: ../src/gtk/gftp-gtk.c:333
-#| msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Vzdálený/Obče_rstvit"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Záložky"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Záložky/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-#| msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Záložky/Přidat _záložku"
 
-#: ../src/gtk/gftp-gtk.c:339
-#| msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Záložky/Upravit záložku"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Záložky/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
-#| msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Přenos"
 
-#: ../src/gtk/gftp-gtk.c:342
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Přenos/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Přenos/_Začít"
 
-#: ../src/gtk/gftp-gtk.c:344
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Přenos/Zas_tavit"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Přenos/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
-#| msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Přenos/Přeskočit _aktuální soubor"
 
-#: ../src/gtk/gftp-gtk.c:348
-#| msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Přenos/Odeb_rat soubor"
 
-#: ../src/gtk/gftp-gtk.c:350
-#| msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Přenos/Posunout soubor nahor_u"
 
-#: ../src/gtk/gftp-gtk.c:352
-#| msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Přenos/Posunout soubor _dolů"
 
-#: ../src/gtk/gftp-gtk.c:355
-#| msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Přenosy/Stáhnout soubo_ry"
 
-#: ../src/gtk/gftp-gtk.c:356
-#| msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Přenosy/Odeslat sou_bory"
 
-#: ../src/gtk/gftp-gtk.c:357
-#| msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "_Evidence"
 
-#: ../src/gtk/gftp-gtk.c:358
-#| msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Evidence/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
-#| msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Evidence/Vyčistit"
 
-#: ../src/gtk/gftp-gtk.c:360
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Evidence/_Zobrazit…"
 
-#: ../src/gtk/gftp-gtk.c:361
-#| msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Evidence/_Uložit…"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Nás_troje"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Nástroje/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
-#| msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Nástroje/P_orovnat okna"
 
-#: ../src/gtk/gftp-gtk.c:365
-#| msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Nástroje/_Vyčistit mezipaměť"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Nápověda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Nápověda/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
-#| msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Nápověda/O _aplikaci"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Počítač: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Počítač: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Uživatel: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Uživatel: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Heslo: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Příkaz: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Název souboru"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Velikost"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributy"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Chyba: Musíte zadat počítač, ke kterému se má připojit\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Občerstvit"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Zadejte jméno uživatele"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Zadejte prosím své uživatelské jméno pro tento server"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Zadejte prosím své heslo pro tento server"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operace zrušena… musíte zadat řetězec\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Vytvořit složku"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Vytvořit složku"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Zadej název vytvářené složky"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Jak byste chtěli přejmenovat %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Server"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Vložte příkaz specifický pro server"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Přidat za SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Změnit složku"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Přeskočeno"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Čeká se…"
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Navázat"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Akce"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Přenést soubory"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2699,59 +2595,59 @@ msgstr ""
 "Následující soubor(y) existuje na místním i vzdáleném počítači.\n"
 "Zvolte prosím, co chcete udělat"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Přeskočit soubor"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Zrušit celý výběr"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Změna masky: Operace zrušena… musíte zadat řetězec\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Změnit masku"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Zadejte novou masku souborů"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Chyba: Nelze otevřít %s pro zápis: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Uložit výpis složky"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Chyba: Chyba při zápisu do %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Soubor se záznamem byl úspěšně zapsán do %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Uložit záznam"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2760,17 +2656,12 @@ msgstr ""
 "Nelze najít soubor s licenčním ujednáním COPYING. Přesvědčte se prosím, že "
 "je v %s nebo %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "O aplikaci gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
-#| msgid ""
-#| "%s\n"
-#| "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
-#| "Official Homepage: http://www.gftp.org/\n";
-#| "Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgid ""
 "%s\n"
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
@@ -2780,27 +2671,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Oficiální domovská stránka: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licenční ujednání"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Zavřít  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Porovnat okna"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Odpojit se od vzdáleného serveru"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2808,72 +2695,56 @@ msgstr ""
 "Připojit se k serveru zadaném v poli počítač. Je-li pole počítač prázdné, "
 "zobrazí se dialogové okno, který vám umožní zadat adresu URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (v mezipaměti) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nespojeno"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Chyba při otevírání souboru %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Nespojeno se vzdáleným serverem\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Tato vlastnost není v tomto protokolu k dispozici\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Musíte vybrat jen jednu položku\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Musíte vybrat aspoň jednu položku\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Změnit"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Přidat"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Ano  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Ne  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Získávají se výpisy složek"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Zastavit  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2882,109 +2753,89 @@ msgstr ""
 "Přeneseno %ld složek\n"
 "a %ld souborů"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Chyba gFTP: Nelze najít soubor %s v %s nebo %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Upravit počítač"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Přidat počítač"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Doména"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Síťová adresa"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Síťová adresa:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Síťová maska"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Síťová _maska:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Doména:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Síťová maska"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Místní počítače"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Upravit"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Upravit"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Volby"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Použít"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Přijímají se názvy souborů…"
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Připojuje se…"
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Přenos souborů: Nespojeno se vzdáleným serverem\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Chyba: Potomek %d vrátil %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Potomek %d úspěšně ukončen\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Chyba: Potomek %d nebyl ukončen správně\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Chyba: Nelze získat informace o souboru %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Soubor %s nebyl změněn\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2993,110 +2844,111 @@ msgstr ""
 "Soubor %s byl změněn.\n"
 "Chcete jej odeslat?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Upravit soubor"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
-#| msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Odesláno %s z %s rychlostí %.2f kB/s, %02d:%02d:%02d odhadem zbývá"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Přijato %s z %s rychlostí %.2f kB/s, %02d:%02d:%02d odhadem zbývá"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
-#| msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Odesláno %s z %s, přenos pozastaven, nelze odhadnout zbývající čas"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Přijato %s z %s, přenos pozastaven, nelze odhadnout zbývající čas"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Dokončena neznámá část. (Soubor %ld z %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% hotovo, %02d:%02d:%02d odhadem zbývá. (Soubor %ld z %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Získávají se názvy souborů… %s bajtů"
 
-#: ../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
+#: 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 "Není vybrán žádný přenos souborů\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Zobrazit"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Upravit"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Zobrazení: %s je složka. Tu nelze zobrazit.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Úprava: %s je složka. Tu nelze upravit.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Úprava: Musíte určit editor v dialogovém okně Volby\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Zobrazení: Nelze vytvořit další proces: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Spouští se program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Otevírá se %s pomocí %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Zobrazuje se soubor %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Zobrazení: Nelze otevřít soubor %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nelze otevřít řídicí terminál %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Jméno uživatele [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -3107,6 +2959,42 @@ msgstr ""
 "(o) přepsat, (r) navázat, (s) přeskočit, (O) přepsat vše, (R) navázat vše, "
 "(S) přeskočit vše: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Zrušit  "
+
+#~ msgid "Host: "
+#~ msgstr "Počítač: "
+
+#~ msgid "User: "
+#~ msgstr "Uživatel: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Zavřít  "
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Ano  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ne  "
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Network Address"
+#~ msgstr "Síťová adresa"
+
+#~ msgid "_Edit"
+#~ msgstr "_Upravit"
+
+#~ msgid "Apply"
+#~ msgstr "Použít"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
diff --git a/po/da.po b/po/da.po
index f3463f5..a2b97f5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,98 +7,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-2.0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-31 13:42+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2008-07-31 03:36+0200\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen gmail com>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Ugyldig URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Fejl: Ugyldig linje %s i mellemlager-indeksfil\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Fejl: Kan ikke oprette mappe %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Fejl: Kan ikke oprette midlertidig fil: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Fejl ved lukning af fildeskriptor: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Fejl: kan ikke søge i filen %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr ""
-"Fejl ved konvertering af strengen \"%s\" fra tegnsættet %s til tegnsættet %"
-"s: %s\n"
+"Fejl ved konvertering af strengen \"%s\" fra tegnsættet %s til tegnsættet "
+"%s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Fejl: Kan ikke åbne lokal fil %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:496
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Fejl: Kunne ikke skrive til sokkel: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:449
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Fejl: Kunne ikke læse fra sokkel: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP fejl: Dårligt bogmærkefilnavn %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Advarsel: Kan ikke finde hovedbogmærkefil %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP fejl: Kan ikke åbne bogmærkefil %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP advarsel: Springer over linie %d i bogmærkefil: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP advarsel: Linie %d har ikke nok argumenter\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -109,7 +109,7 @@ msgstr ""
 "eller dont_use_proxy=netværksnummer/netmaske"
 
 # ???
-#: ../lib/config_file.c:507
+#: 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"
@@ -117,52 +117,52 @@ msgstr ""
 "ext=fil-endelse:XPM-fil:Ascii eller binær (A eller B):fremvisningsprogram. "
 "Bemærk: Alle argumenter pånær fil-endelsen er valgfri"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP fejl: Dårligt konfigfilnavn %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP fejl: Kunne ikke oprette mappe %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP fejl: Kan ikke finde hovedkonfigfil %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Kørte du \"make install\"?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP fejl: Kan ikke åbne konfigfil %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Afbryder på grund af fortolkningsfejl ved linje %d i konfigfilen\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP advarsel: Springer over linie %d i konfigfil: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP fejl: Dårligt logfilnavn %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP-advarsel: Kan ikke skrive til %s: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -171,7 +171,7 @@ msgstr ""
 "org>. Advarsel: Enhver kommentar du tilføjer til denne fil VIL blive "
 "overskrevet"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -183,7 +183,7 @@ msgstr ""
 "kigger dig over skulderen når du redigerer denne fil. I tidligere udgaver "
 "blev alle adgangskoder opbevaret i klartekst."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -193,96 +193,95 @@ msgstr ""
 "Advarsel: Enhver kommentar som du føjer til denne fil VIL blive overskrevet. "
 "Hvis et element har en (*) i sin kommentar, kan den ikke ændres fra gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ukendt>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "FATAL gFTP-fejl: Konfigurationstilvalg \"%s\" blev ikke fundet i global "
 "hashtabel\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Fejl: Kan ikke lægge filen %s op\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Fejl: Kan ikke skrive til filen %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Fejl: Fejl under lukning af filen: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Korrumperet filoversigt fra FSP-server %s\n"
 
-#: ../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
+#: 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 "ukendt"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Kunne ikke hente FPS-mappeoversigt %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Ændrede mappe til %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kunne ikke ændre mappe til %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Fjernede %s med succes\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Fejl: Kunne ikke fjerne mappe %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Fejl: Kunne ikke fjerne fil %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Oprette mappen %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Omdøbte %s til %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Fejl: Kunne ikke omdøbe %s til %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -290,7 +289,7 @@ msgstr ""
 "FTPS-understøttelse utilgængelig da SSL-understøttelse ikke blev inkluderet "
 "ved kompilering. Afbryder forbindelsen.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -298,108 +297,106 @@ msgstr ""
 "HTTPS-understøttelse utilgængelig da SSL-understøttelse ikke blev inkluderet "
 "ved kompilering. Afbryder forbindelsen.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Kunne ikke hente den aktuelle arbejdsmappe: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Ændrede lokal mappe til %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Kunne ikke ændre lokal mappe til %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Fejl: Kan ikke afkorte den lokale fil %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Kunne ikke hente lokal filoversigt %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Ændrede modus fra %s til %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Fejl: Kunne ikke ændre modus fra %s til %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Ændrede tidsstempel for %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Fejl: Kunne ikke ændre tidsstempel for %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalt filsystem"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "brug: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fil"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "størrelse"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "bruger"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "gruppe"
 
 # ???
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datetime"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attributter"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "faldende"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "stigende"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Generelt"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Fremviserprogram:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -407,27 +404,27 @@ msgstr ""
 "Standardprogram til at se indhold af filer med. Hvis dette felt er tomt, vil "
 "den interne filfremviser blive brugt"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Redigeringsprogram:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Standardprogram til at redigere filer med."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maks logvinduesstørrelse:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Den maksimale størrelse af log-vinduet i bytes for GTK+-udgaven"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Fjerne tegnsæt:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -435,11 +432,11 @@ msgstr ""
 "Dette er en kommasepareret liste af tegnsæt, hvormed det forsøges at "
 "konvertere fjernmeddelelser til den aktuelle lokalitet"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Fjern LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -448,189 +445,193 @@ msgstr ""
 "datoer kan fortolkes korrekt i mappeoversigterne."
 
 # TTL: time to live (wikipedia)
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Levetid for mellemlager:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Antallet af sekunder, hvori elementer holdes i mellemlageret, før de udløber."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Tilføj filoverførsler"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Føj nye filoverførsler til eksisterende"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Én overførsel ad gangen"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Kun én overførsel ad gangen?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Overskriv som standard"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Overskriv filer som standard eller genoptag filoverførsler"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Bevar filrettigheder"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Bevar de overførte filers rettigheder"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Bevar filtidsangivelser"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Bevar tidsangivelserne for de overførte filer"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Genopfrisk efter hver filoverførsel"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Genopfrisk fillisten efter hver fil er overført"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Vis mapper først"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Vis mapperne før filerne"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Vis skjulte filer"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Vis skjulte filer i fillisterne"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Vis overførselsstatus i titlen"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Vis status for filoverførsel i titellinjen"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Begynd filoverførsler"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Start filoverførslerne automatisk når de sættes i kø"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Tillad manuelle kommandoer i grafisk brugergrænseflade"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Tillad indtastningen af manuelle kommandoer i den grafiske brugergrænseflade "
 "(fungerer som i tekstudgaven)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Husk seneste mappe"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Gem sidste lokale og fjerne mappe når programmet afsluttes"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Kobl til fjern server ved opstart"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Kobl automatisk til den fjerne server når programmet startes."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Netværk"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Netværkstidsudløb:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Tidsudløb når der ventes på netværksind- eller uddata. Dette har IKKE noget "
 "at gøre med inaktivitet."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Antal forsøg på forbindelse:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Antal automatiske forsøg der foretages. Vælg 0 for uendeligt antal forsøg"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tid før gentag:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Antal sekunder mellem hvert forsøg"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maks kB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Maksimum kB/s en filoverførsel kan få. (Brug 0 for at slå fra)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Blokstørrelse for overførsel:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Blokstørrelsen der benyttes ved filoverførsel. Dette bør være et multiplum "
 "af 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Standardprotokol:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Angiver, hvilken protokol der skal være standard"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Aktivér IPv6-understøttelse"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -638,27 +639,27 @@ msgstr ""
 "Dette definerer hvad der vil ske, når du dobbeltklikker på en fil i fil-"
 "listefelterne. 0=vis fil, 1=redigér fil, 2=overfør fil"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Standardbredde på fillisten over lokale filer"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Standardbredde på fillisten over fjerne filer"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Standardhøjde på fillisten over lokale/fjerne filer"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Standardhøjde på overførselsfillisten"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Standardhøjde på logvinduet"
 
-#: ../lib/options.h:177
+#: 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."
@@ -666,15 +667,15 @@ msgstr ""
 "Bredden af filnavns-kolonnen i overførselsvinduet. Sæt denne til 0 for at "
 "lade kolonnen justere sin størrelse på automagisk vis."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Kolonnen der som standard benyttes til sortering"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortér stigende eller faldende"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -683,7 +684,7 @@ msgstr ""
 "kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -692,7 +693,7 @@ msgstr ""
 "lade kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -701,7 +702,7 @@ msgstr ""
 "kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,7 +711,7 @@ msgstr ""
 "kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -719,7 +720,7 @@ msgstr ""
 "kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -728,75 +729,75 @@ msgstr ""
 "lade kolonnen justere sin størrelse på automagisk vis. Sæt den til -1 for at "
 "deaktivere denne kolonne"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Farven af kommandoerne der bliver sendt til serveren"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Farven af kommandoerne der modtages fra serveren"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Farve af fejlmeddelelserne"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Farven af resten af logmeddelelserne"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokal"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bogmærke"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Filoverførslen vil blive begrænset til %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Kunne ikke sætte LC_TIME til \"%s\". Falder tilbage til \"%s\"\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Indlæser mappeoversigt %s fra mellemlager (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Indlæser mappeoversigt %s fra server (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -805,109 +806,109 @@ msgstr ""
 "Advarsel: Fjerner sti fra filen \"%s\". Den fjernede sti (%s) svarer ikke "
 "til den aktuelle mappe (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Fejl: Kunne ikke skrive til mellemlager: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Fejl: Kunne ikke finde bogmærke %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Bogmærkefejl: Bogmærkeelementet %s har ikke noget værtsnavn\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokollen \"%s\" er i øjeblikket ikke understøttet.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Fandt rekursivt symbolsk henvisning %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "Fejl: Fjernt sted %s afbrød forbindelse. Maks forsøg nået...giver op\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Fejl: Fjernt sted %s afbrød forbindelse. Prøver igen om %d sekunder\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Fejl: Kan ikke sætte \"close on exec\"-flag: %s\n"
 
 # pty = pseudoterminal
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Kan ikke åbne hoved-pseudoterminal %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kan ikke oprette sokkelpar: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Fejl: Kan ikke køre ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Kan ikke forgrene endnu en proces: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxyværtsnavn:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Brandmursværtsnavn"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxyport:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port at forbinde til på brandmuren"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxybrugernavn:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Dit brandmursbrugernavn"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxyadgangskode:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Din brandmursadgangskode"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Brug HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vil du bruge HTTP/1.1 eller HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -916,65 +917,65 @@ msgstr ""
 "Modtog forkert svar fra serveren, kobler af\n"
 "Ugyldig klumpstørrelse \"%s\" returneret af den fjerne server\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Afbryder forbindelse til sted %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Starter filoverførslen ved offset "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Kan ikke hente fil %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Henter filoversigt...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Modtog forkert svar fra serveren, kobler af\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE-kommando"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "bruger vært"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "bruger vært:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "bruger vært port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "bruger vært NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP-proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personlig"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Epostadresse:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -982,19 +983,19 @@ msgstr ""
 "Dette er adgangskoden der vil blive benyttet når du logger på en fjern FTP-"
 "server som anonym"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxykonto:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Din brandsmurskonto (valgfri)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxyservertype:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1011,11 +1012,11 @@ msgstr ""
 "(kode), h (vært), o (port) eller a (konto). For eksempel kan du skrive %pu "
 "for at angive proxybrugeren"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorér PASV-adresse"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1027,11 +1028,11 @@ msgstr ""
 "ofte nødvendigt for routere der oplyser deres interne fremfor deres eksterne "
 "IP-adresse i et PASV-svar."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive filoverførsler"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1047,11 +1048,11 @@ msgstr ""
 "deaktiveret, så vil gFTP åbne en port på klientsiden, og den fjerne server "
 "vil forsøge at forbinde til den."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Evaluér fjerne symbolske henvisninger (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1063,15 +1064,16 @@ msgstr ""
 "Det vil kun være relevant at deaktivere dette, hvis den fjerne FTP-server "
 "ikke understøtter tilvalget -L til LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Overfør filer i ASCII-tilstand"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1080,252 +1082,247 @@ msgstr ""
 "i tekstfiler. Hvis du overfører fra UNIX til UNIX, så er det sikkert at lade "
 "denne være slået fra. Hvis du henter binær data, så slå denne fra."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ugyldigt svar \"%c\" modtaget fra serveren.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Kunne ikke oprette IPv4-sokkel: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Kan ikke finde IP-adresse i PASV-svaret \"%s\"\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Ignorerer IP-adressen i PASV-svaret, forbinder til %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Kan ikke oprette en dataforbindelse: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Kan ikke hente sokkelnavn: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Kan ikke binde en port: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Kan ikke lytte til port %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Kunne ikke oprette IPv6-sokkel: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Fejl: Det ser ikke ud til at vi er koblet til via IPv6. Afbryder "
 "forbindelsen.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Ugyldigt EPSV-svar \"%s\"\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kan ikke hente adresse for lokal sokkel: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kan ikke acceptere forbindelse fra server: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Advarsel: Kan ikke tolke filoversigt %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Slår %s op\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Kan ikke finde værtsnavn %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Kunne ikke oprette sokkel: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Prøver %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Kan ikke forbinde til %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Forbundet til %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Kan ikke slå servicenavnet %s/tcp op. Kontrollér venligst din service-fil\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Forbindelse til %s løb ud\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Kan ikke hente sokkelflag: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Kan ikke sætte sokkel til ikke-blokerende tilstand: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH prognavn:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Stien til SSH-programmets kørbare fil"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Ekstra SSH-parametre:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Ekstra parametre der gives til SSH-programmet"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Kræver SSH bruger/kode"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Brugernavn/adgangskode kræves for SSH-forbindelser"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Kører program %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Indtast adgangskode for RSA-nøgle"
 
 # Mærkeligt.
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Indtast adgangskode for nøglen '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "adgangskode"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nej)?"
 
 # passcode? wikipedia: Passcode is sometimes taken to imply that the information used is purely numeric, 
such as the personal identification number (PIN) commonly used for ATM access.
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Indtast adgangskode:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Indtast SecurID-adgangskode:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Fejl: Der blev indtastet forkert adgangskode\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protokolinitiering\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokolversion %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Åbn %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Luk\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Åbn mappen %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Læs mappe\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Fjern filen %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Opret mappen %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Fjern mappen %s\n"
@@ -1333,87 +1330,83 @@ msgstr "%d: Fjern mappen %s\n"
 # wikipedia om DOS-commands, under "truename":
 #
 # This command is similar to the Unix which command, which, given an executable found in $PATH, would give a 
full path and name. The C library function realpath performs this function.
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Filegenskaber\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Ok"
 
 # end-of-file. Men der findes ingen accepteret forkortelse på dansk, mig bekendt
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ingen sådan fil eller mappe"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Tilladelse nægtet"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Fejl"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Fejlformet meddelelse"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Ingen forbindelse"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Forbindelse tabt"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operation ikke understøttet"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Ukendt meddelelse returneret fra server"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Fejl: meddelelsesstørrelse %d er for stor\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Fejl: Meddelelsesstørrelse %d fra serveren er for stor\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1421,41 +1414,41 @@ msgstr ""
 "Der opstod en fejl under initiering af en SSH-forbindelse med den fjerne "
 "server. Fejlmeddelelsen fra den fjerne server følger:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Åbner SSH-forbindelse til %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Loggede på SSH-serveren %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-motor"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL-entropifil:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL-entropifil"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Længde af entropi-kim:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Det maksimale antal bytes der benyttes som kim til SSL-motoren"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificér SSL-peer"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1468,11 +1461,11 @@ msgstr ""
 "Subjekt = %s\n"
 "Fejl %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Kan ikke hente peer-certifikat\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 "
@@ -1481,55 +1474,45 @@ msgstr ""
 "FEJL: Værten i SSL-certifikatet (%s) svarer ikke til den vært, vi koblede "
 "til (%s). Afbryder forbindelsen.\n"
 
-#: ../lib/sslcommon.c:305
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Kan ikke initiere OpenSSL-biblioteket\n"
 
-#: ../lib/sslcommon.c:320
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Fejl under indlæsning af standard-SSL-certifikater\n"
 
-#: ../lib/sslcommon.c:332
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Fejl ved indstilling af cipher-liste (ingen gyldig cipher)\n"
 
-#: ../lib/sslcommon.c:352 ../lib/sslcommon.c:426 ../lib/sslcommon.c:474
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Fejl: SSL-motoren blev ikke initieret\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Fejl under etablering af SSL-forbindelse (BIO-objekt)\n"
 
-#: ../lib/sslcommon.c:379
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Fejl under etablering af SSL-forbindelse (SSL-objekt)\n"
 
-#: ../lib/sslcommon.c:400
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Fejl med peer-certifikat: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operation annulleret\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Venter %d sekunder får jeg prøver at forbinde igen\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 ""
-">. Hvis du har nogen spørgsmål, kommentarer eller forslag til dette program, "
-"så send dem gerne til mig via e-post. Du kan altid finde de seneste nyheder "
-"om gFTP på min hjemmeside http://www.gftp.org/\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 "
@@ -1539,7 +1522,7 @@ msgstr ""
 "er frit programmel, og du er velkommen til at videredistribuere det under "
 "visse betingelser; se filen COPYING for detaljer\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Oversat af\n"
@@ -1550,70 +1533,70 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: ../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 "Fejl: Ikke forbundet til et fjernt sted\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "brug: chmod <tilstand> <fil>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "brug: rename <gammelt navn> <nyt navn>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "brug: delete <fil>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "brug: rmdir <mappe>\n"
 
 # ???
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "brug: site <kommando>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "brug: mkdir <ny mappe>\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 "brug: chdir <mappe>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Ugyldigt argument\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Ryd mappemellemlageret\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "brug: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "brug: set [variabel = værdi]\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 "Fejl: Variablen %s er ikke en gyldig konfigurationsvariabel.\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 "Fejl: Variablen %s er ikke tilgængelig i tekst-udgaven af gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1621,288 +1604,288 @@ msgstr ""
 "Understøttede kommandoer:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "brug: %s <filspec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "om"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Viser gFTP-information"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Sætter den nuværende filoverførsels-tilstand til Ascii (kun til FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binær"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Sætter den nuværende filoverførsels-tilstand til binær (kun til FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Ændrer den fjerne arbejdsmappe"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Ændrer rettighederne for en fjern fil"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "ryd"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Tilgængelige indstillinger: mellemlager"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "luk"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Kobler af fjerncomputeren"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "slet"
 
 # argh
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Fjerner en fjern fil"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Viser mappeoversigten for den aktuelle fjerne mappe"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Henter fjerne filer"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "hjælp"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Viser denne hjælpeskærm"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Ændrer den lokale arbejdsmappe"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Ændrer rettighederne for en lokal fil"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Fjerner en lokal fil"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Viser mappeoversigten for den aktuelle lokale mappe"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Opretter en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Viser den aktuelle lokale mappe"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Omdøb en lokal fil"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Fjern en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Opretter en fjern mappe"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Lægger lokale filer op"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "åbn"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Åbner en forbindelse til et fjernt netsted"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Vis nuværende fjerne mappe"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "afslut"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Afslut gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "omdøb"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Omdøb en fjern fil"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Slet en fjern mappe"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "sæt"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Vis variable for konfigurationsfilen. Du kan også indstille variable med "
 "\"set var=værdi\""
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "sted"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Indtast sted-specifik kommando"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Fejl: Ukendt kommando\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Overførte %s med %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Udelader fil %s på vært %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Stopper overførsel til vært %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Kunne ikke downloade %s fra %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1911,37 +1894,36 @@ msgstr ""
 "Der var %d filer eller mapper der ikke kunne overføres. Disse elementer "
 "fremgår af loggen."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Tryk venligst på stop-knappen før du gør noget andet\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Kør bogmærke"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Tilføj bogmærke: Du skal indtaste et navn for bogmærket\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Tilføj bogmærke: Kan ikke tilføje bogmærke %s fordi navnet allerede er i "
 "brug\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Tilføj bogmærke"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Tilføj bogmærke: Du skal indtaste et værtsnavn\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1951,31 +1933,31 @@ msgstr ""
 "Du kan adskille elementer vha. en / for at lave undermenuer\n"
 "(f.eks: Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Du skal angive et navn til bogmærket."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Indtast navn på ny mappe som skal oprettes"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nyt element"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Indtast navn på nyt element som skal oprettes"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1984,106 +1966,99 @@ msgstr ""
 "Er du sikker på at du vil slette bogmærket\n"
 "%s alle dets afledte bogmærker?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Slet bogmærker"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Redigér indgang"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Værtsnavn:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Fjern mappe:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokal mappe:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Logind som ANONYM"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Annullér  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Filer"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Filer/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Filer/Ny _mappe..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Filer/Nyt _element..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Filer/_Slet"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Filer/_Egenskaber..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Filer/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Filer/_Luk"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Redigér bogmærker"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2091,91 +2066,90 @@ msgstr ""
 "Du kan nu justere dine filers attributter\n"
 "Bemærk: Ikke alle ftp-servere understøtter chmod-funktionen"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciel"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Klæbrig"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Bruger"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Læs"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Skriv"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Udfør"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Andre"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Er du sikker på at du vil slette disse %ld filer og %ld mapper"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Er du sikker på at du vil slette disse %ld filer"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Er du sikker på at du vil slette disse %ld mapper"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Slet filer/mapper"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Slet"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Forbind"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Modtog URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Træk og slip"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Afslut"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2183,468 +2157,455 @@ msgstr ""
 "Der er filoverførsler igang.\n"
 "Er du sikker på at du vil afslutte?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Åbn placering"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Indtast URL du vil forbinde til"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Vindue _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Vindue _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binær"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Indstillinger..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Afslut"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokal"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokal/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokal/_Åbn sted..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokal/Af_bryd forbindelse"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokal/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokal/Ændr _filspec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokal/_Vis valgte"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokal/Vælg _alle"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokal/Vælg alle filer"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokal/Fravælg alle"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokal/Gem mappeoversigt..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokal/Send SITE-kommando..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokal/_Skift mappe"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokal/_Rettigheder..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Lokal/_Ny mappe..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokal/O_mdøb..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokal/S_let..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokal/Redi_gér..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokal/_Vis..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokal/_Opdatér"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/F_remmed"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Fjern/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Fjern/_Åbn placering..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Fjern/_Afbryd forbindelse"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Fjern/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Fjern/Ændr _filspec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Fjern/_Vis valgte"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Fjern/Vælg _alle"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Fjern/Vælg alle filer"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Fjern/Fravælg alle"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Fjern/Gem mappeoversigt..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Fjern/Send SITE-kommando..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Fjern/_Skift mappe"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Fjern/_Rettigheder..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Fjern/_Ny mappe..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Fjern/O_mdøb..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Fjern/S_let..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Fjern/Redi_gér..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Fjern/_Vis..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Fjern/_Opdatér"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bogmærker"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bogmærker/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bogmærker/Tilføj _bogmærke"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bogmærker/Redigér bogmærker"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bogmærker/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/Ov_erførsel"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Overførsel/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Overførsel/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Overførsel/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Overførsel/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Overførsel/Spring _aktuelle fil over"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Overførsel/_Fjern fil"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Overførsel/Flyt fil _op"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Overførsel/Flyt fil _ned"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Overførsel/_Hent filer"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Overførsel/_Læg filer ud"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Ryd"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_Vis"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Gem..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Værktøj"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Værktøj/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Værktøj/S_ammenlign vinduer"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Værktøj/_Ryd mellemlager"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Hjælp"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Hjælp/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Hjælp/_Om"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Vært: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Vært: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Bruger: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Bruger: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Adgkode: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Kommando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dato"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attributter"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Fejl: Du skal indtaste en vært at forbinde til\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Genopfrisk"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Indtast brugernavn"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Indtast venligst dit brugernavn for dette sted"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Indtast venligst din adgangskode for dette sted"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operationen annulleret... du skal indtaste en tekst\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Opret mappe"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Indtast navn på mappe som skal oprettes"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Omdøb"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Hvad vil du gerne omdøbe %s til?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Netsted"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Indtast sted-specifik kommando"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Foranstil SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Udeladt"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Genoptag"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Udelad"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Handling"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Overfør filer"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2652,59 +2613,59 @@ msgstr ""
 "De(n) følgende fil(er) findes både på den lokale og fjerne computer\n"
 "Vælg venligst hvad du vil gøre"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Spring fil over"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Vælg alle"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Fravælg alle"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Ændr filspec: Operation annulleret...du skal indtaste en tekst\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Ændr filspec"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Indtast den nye filspecifikation"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Fejl: Kan ikke åbne %s for at skrive: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Gem mappeoversigt"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Fejl: Fejl ved skrivning til %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Skrev logfilen til %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Gem logfil"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2713,11 +2674,11 @@ msgstr ""
 "Kan ikke finde licensaftalefilen COPYING. Sørg venligst for at den ligger i "
 "enten %s eller %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Om gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2728,27 +2689,23 @@ msgstr ""
 "Ophavsret (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Officiel hjemmeside: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licensaftale"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Luk  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Sammenlign vinduer"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Afbryd forbindelse med fjern server"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2756,72 +2713,56 @@ msgstr ""
 "Kobl til stedet angivet i vært-feltet. Hvis vært-feltet er tomt, vil der "
 "blive vist et dialogvindue hvori der kan indtastes en URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Lagret) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Ikke forbundet"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Fejl ved åbning af fil %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Ikke forbundet til et fjerne netsted\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Denne funktion er ikke tilgængelig med denne protokol\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Du må kun vælge ét element\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Du skal vælge mindst ét element\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Ændr"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Tilføj"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Annullér"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Ja  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nej  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Henter en mappeoversigt"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2830,109 +2771,89 @@ msgstr ""
 "Modtog %ld mapper\n"
 "og %ld filer"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP fejl: Kan ikke finde fil %s i %s eller %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Redigér vært"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Tilføj vært"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Type:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domæne"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Netværksadresse"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Netværksadresse:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Netmaske"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etmaske:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domæne:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netmaske"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokale værter"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Redigér"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Indstillinger"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Anvend"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Modtager filnavne..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Forbinder..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Hent filer: Ikke forbundet til et fjernt websted\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Fejl: Underproces %d returnerede %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Underproces %d returnerede med success\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Fejl: Underproces %d blev ikke afsluttet korrekt\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Fejl: Kan ikke få information om fil %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Fil %s blev ikke ændret\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2941,118 +2862,166 @@ msgstr ""
 "Filen %s er ændret.\n"
 "Vil du lægge den op?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Redigér filer"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Færdig"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Sendte %s af %s med %.2fKB/s, anslået tid tilbage: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Modtog %s af %s ved %.2fKb/s, anslået tid tilbage: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Sendte %s af %s, overførsel stoppet, uvist hvor lang tid der er igen"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Modtog %s af %s, overførsel stoppet, uvist hvor meget der mangler"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Ukendt procentdel færdiggjort. (Fil %ld af %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% færdig, anslået tid tilbage: %02d:%02d:%02d. (Fil %ld af %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Modtager filnavne...%s byte"
 
-#: ../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
+#: 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 "Der er ikke valgt nogen filoverførsler\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Vis"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Redigér"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Vis: %s er en mappe. Kan ikke vise den.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Redigér: %s er en mappe. Kan ikke redigere den.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Redigér: Du skal angive en tekstbehandler i indstillingsmenuen\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Vis: Kan ikke oprette en ny proces: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Kører program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Åbner %s med %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viser fil %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Vis: Kan ikke åbne fil %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kan ikke åbne den styrende terminal %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Brugernavn [anonym]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s findes allerede. (kildestørrelse %s, destinationsstørrelse %s):\n"
 "o: overskriv, r: fortsæt, s: spring over, O: overskriv alle, R: fortsæt "
 "alle, S: spring alle over: (%c)"
 
+#~ 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 ""
+#~ ">. Hvis du har nogen spørgsmål, kommentarer eller forslag til dette "
+#~ "program, så send dem gerne til mig via e-post. Du kan altid finde de "
+#~ "seneste nyheder om gFTP på min hjemmeside http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Annullér  "
+
+#~ msgid "Host: "
+#~ msgstr "Vært: "
+
+#~ msgid "User: "
+#~ msgstr "Bruger: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Luk  "
+
+#~ msgid "Add"
+#~ msgstr "Tilføj"
+
+#~ msgid "Cancel"
+#~ msgstr "Annullér"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Ja  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nej  "
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Network Address"
+#~ msgstr "Netværksadresse"
+
+#~ msgid "_Edit"
+#~ msgstr "_Redigér"
+
+#~ msgid "Apply"
+#~ msgstr "Anvend"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
diff --git a/po/de.po b/po/de.po
index 8f33608..b0ee761 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,49 +10,49 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-26 22:38+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-04-29 17:16+0100\n"
 "Last-Translator: Mario Blättermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Ungültige URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Fehler: Ungültige Zeile %s in der Cache-Indexdatei\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Fehler: Ordner %s konnte nicht erstellt werden: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Fehler: Zwischendatei kann nicht erzeugt werden: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Fehler beim Dateischließen: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Fehler: Suche in Datei %s kann nicht ausgeführt werden: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -60,58 +60,58 @@ msgstr ""
 "Fehler beim Konvertieren der Zeichenkette »%s« von Zeichensatz %s zu "
 "Zeichensatz %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Fehler: Lokale Datei %s kann nicht geöffnet werden: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Fehler: Auf Socket kann nicht geschrieben werden: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Fehler: Von Socket %s konnte nicht gelesen werden\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP-Fehler: Falscher Name der Lesezeichendatei %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Warnung: Haupt-Lesezeichendatei %s kann nicht gefunden werden\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP-Fehler: Lesezeichendatei %s kann nicht geöffnet werden: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP-Warnung: Zeile %d in Lesezeichendatei wird übersprungen: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP-Warnung: Zeile %d hat nicht genug Argumente\n"
 
-#: ../lib/config_file.c:504
+#: 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 ""
-"Dieser Abschnitt gibt an, welche Rechner sich im lokalen Subnetz befinden und "
-"den Proxy-Server (wenn vorhanden) nicht zu benutzen brauchen. Syntax: "
+"Dieser Abschnitt gibt an, welche Rechner sich im lokalen Subnetz befinden "
+"und den Proxy-Server (wenn vorhanden) nicht zu benutzen brauchen. Syntax: "
 "dont_use_proxy=.domain oder dont_use_proxy=netzwerknummer/netzmaske"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -119,174 +119,174 @@ msgstr ""
 "ext=Dateiendung:XPM-Datei:ASCII oder Binär (A oder B):Betrachterprogramm. "
 "Hinweis: Alle Angaben außer der Dateiendung sind optional"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Fehler: Konfigurationsdateiname %s ungültig\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP-Fehler: Ordner %s konnte nicht erstellt werden: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
-msgstr "gFTP-Fehler: Hauptkonfigurationsdatei %s konnte nicht gefunden werden\n"
+msgstr ""
+"gFTP-Fehler: Hauptkonfigurationsdatei %s konnte nicht gefunden werden\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Haben Sie das Programm installiert?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP-Fehler: Konfigurationsdatei %s kann nicht geöffnet werden: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Programmabruch wegen Parserfehlers in Zeile %d der Konfigurationsdatei\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP-Warnung: Zeile %d in Konfigurationsdatei wird übersprungen: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP-Fehler: Falscher Name der Protokolldatei %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP-Warnung: %s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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 ""
-"Lesezeichendatei für gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
-"org>. Warnung: Alle Kommentare, die Sie dieser Datei hinzufügen,  werden "
-"ÜBERSCHRIEBEN"
+"Lesezeichendatei für gFTP. Copyright (C) 1998-2007 Brian Masney "
+"<masneyb gftp org>. Warnung: Alle Kommentare, die Sie dieser Datei "
+"hinzufügen,  werden ÜBERSCHRIEBEN"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"Beachte: Die Passwörter in dieser Datei sind nur verschleiert. Dies ist nicht "
-"sicher, es soll nur verhindern, dass jemand, der Ihnen über die Schulter "
-"schaut, das Passwort einfach lesen kann, während Sie diese Datei bearbeiten. "
-"Früher wurden alle Passwörter im Klartext gespeichert."
+"Beachte: Die Passwörter in dieser Datei sind nur verschleiert. Dies ist "
+"nicht sicher, es soll nur verhindern, dass jemand, der Ihnen über die "
+"Schulter schaut, das Passwort einfach lesen kann, während Sie diese Datei "
+"bearbeiten. Früher wurden alle Passwörter im Klartext gespeichert."
 
-#: ../lib/config_file.c:845
+#: 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"
+"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 ""
 "Konfigurationsdatei für gFTP. Copyright (C) 1998-2007 Brian Masney "
 "<masneyb gftp org>. Warnung: Alle Kommentare, die Sie dieser Datei "
 "hinzufügen, werden ÜBERSCHRIEBEN. Einträge, die mit einem (*) im Kommentar "
 "gekennzeichnet sind, können Sie nicht aus gFTP heraus ändern"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<Unbekannt>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
-"FATALER gFTP-Fehler: Konfigurationsoption '%s' wurde nicht in der global hash "
-"Tabelle gefunden\n"
+"FATALER gFTP-Fehler: Konfigurationsoption '%s' wurde nicht in der global "
+"hash Tabelle gefunden\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Fehler: Die Datei %s konnte nicht hochgeladen werden\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Fehler: In die Datei %s konnte nicht geschrieben werden: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Fehler: Fehler beim Schließen der Datei: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Fehlerhafte Dateiliste vom FSP-Server %s\n"
 
-#: ../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
+#: 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 "Unbekannt"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Abrufen der FSP-Ordnerliste %s fehlgeschlagen: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Ordner erfolgreich nach %s gewechselt\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Ordner konnte nicht nach %s gewechselt werden\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s erfolgreich gelöscht\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Fehler: Ordner %s konnte nicht gelöscht werden: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Fehler: Datei %s konnte nicht gelöscht werden: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Ordner %s erfolgreich angelegt\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s erfolgreich in %s umbenannt\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Fehler: %s konnte nicht in %s umbenannt werden: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -294,7 +294,7 @@ msgstr ""
 "FTPS-Übertragung nicht verfügbar, da keine SSL-Unterstützung einkompiliert "
 "wurde. Verbindung abgebrochen.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -302,111 +302,109 @@ msgstr ""
 "HTTPS-Übertragung nicht verfügbar, da keine SSL-Unterstützung einkompiliert "
 "wurde. Verbindung abgebrochen.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Arbeitsordner konnte nicht ermittelt werden: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Lokaler Ordner erfolgreich nach %s gewechselt\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Lokaler Ordner konnte nicht nach %s gewechselt werden: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Fehler: Lokale Datei %s kann nicht abgeschnitten werden: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Lokale Ordnerliste %s konnte nicht ermittelt werden: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Erfolgreich den Modus von %s nach %o geändert\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Fehler: Modus konnte nicht von %s nach %o geändert werden: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Zeitstempel von %s wurde erfolgreich geändert\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Fehler: Zeitstempel von %s konnte nicht geändert werden: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "Lokales Dateisystem"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "Verwendung: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "kein"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "Datei"
 
 #
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "Größe"
 
 #
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "Nutzername"
 
 #
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "Gruppe"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "Datum"
 
 #
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "Attribute"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "Absteigend"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "Ansteigend"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Allgemein"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Betrachterprogramm:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -414,27 +412,27 @@ msgstr ""
 "Das Standardprogramm, welches zur Dateibetrachtung benutzt wird. Bei keiner "
 "Angabe wird der interne Betrachter benutzt"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Bearbeitungsprogramm:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Das Standardprogramm zur Dateibearbeitung."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Max. Protokollfenstergröße"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Die maximale Größe des Protokollfensters bei der GTK+ Variante"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Zeichensätze der Gegenstelle:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -442,11 +440,11 @@ msgstr ""
 "Dies ist eine durch Komma getrennte Liste von Zeichensätzen, mit denen "
 "versucht wird, Nachrichten in die lokale Sprache zu übertragen"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME der Gegenstelle:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -455,246 +453,253 @@ msgstr ""
 "wird benötigt, um die Datumsangaben in den Ordnerlisten richtig umsetzen zu "
 "können."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Die Anzahl Sekunden, welche Cache-Einträge gültig sind, bevor sie verfallen."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Dateiübertragungen anhängen"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Neue Dateiübertragungen an Bestehende anhängen"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Jeden Transfer einzeln"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Nur je eine Übertragung gleichzeitig durchführen?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Standardmäßig überschreiben"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Überschreibe Dateien standardmäßig oder setzen um Dateiübertragungen "
 "wiederaufzunehmen"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Dateirechte beibehalten"
 
 #
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Ändert die Rechte einer Datei auf der Gegenstelle"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Zeitstempel der Dateien beibehalten"
 
 #
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Behält den Zeitstempel von übertragenen Dateien bei"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Aktualisieren nach jedem Dateitransfer"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Die Dateiliste nach jeder Dateiübertragung erneuern"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordner am Anfang"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Ordner vor den Dateien einsortieren"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Versteckte Dateien anzeigen"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Versteckte Dateien in den Listenfeldern anzeigen"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Übertragungsstatus im Titel anzeigen"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Übertragungsstatus in der Titelzeile anzeigen"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Dateiübertragungen starten"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Dateiübertragungen automatisch nach dem Eintragen starten"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Befehlseingabe im GUI erlauben"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
-"Befehlseingabe im GUI erlauben (Funktioniert wie in der Textvariante von gftp)"
+"Befehlseingabe im GUI erlauben (Funktioniert wie in der Textvariante von "
+"gftp)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Letzten Ordner speichern"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
-"Den letzten lokalen und entfernten Ordner beim Beenden der Anwendung speichern"
+"Den letzten lokalen und entfernten Ordner beim Beenden der Anwendung "
+"speichern"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Verbindung zur Gegenstelle beim Start"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Automatisch beim Start der Anwendung mit dem entfernten Server verbinden"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Netz"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Netzwerk-Zeitlimit:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Zeitdauer, die bei Netzwerkoperationen gewartet wird. Dies ist KEINE "
 "Begrenzung der Leerlaufzeit."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Anzahl der Verbindungsversuche:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "Die Anzahl der automatischen Verbindungsversuche (0 = unendlich oft)."
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Wartezeit zwischen Verbindungsversuchen:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Die Anzahl Sekunden zwischen den Wahlwiederholungen"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max. KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Die maximale Transferrate in KB/s, die eine Dateiübertragung erreichen darf. "
 "(0 = max.)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Übertragungsblockgröße:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a multiple "
-"of 1024."
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
 msgstr ""
 "Die Blockgröße, die beim Übertragen von Dateien genutzt wird. Sie sollte ein "
 "Mehrfaches von 1024 sein."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Voreingestelltes Protokoll:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Dies legt das voreingestellte Protokoll fest"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Aktiviere IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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 ""
-"Dies legt fest, was beim Doppelklick auf eine Datei der Dateiliste geschieht. "
-"0=Datei betrachten 1=Datei bearbeiten 2=Datei übertragen"
+"Dies legt fest, was beim Doppelklick auf eine Datei der Dateiliste "
+"geschieht. 0=Datei betrachten 1=Datei bearbeiten 2=Datei übertragen"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Die Standardbreite der lokalen Dateiliste"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Die Standardbreite der Dateiliste der Gegenstelle"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Die Standardhöhe der lokalen / entfernten Dateilisten"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Die Standardhöhe der Übertragungsliste"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Die Standardhöhe des Protokollfensters"
 
-#: ../lib/options.h:177
+#: 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 ""
-"Die Breite der Dateinamenspalte im Übertragungsfenster. Bei 0 wird die Breite "
-"automatisch angepasst"
+"Die Breite der Dateinamenspalte im Übertragungsfenster. Bei 0 wird die "
+"Breite automatisch angepasst"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Die Spalte, nach der sortiert wird"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "An- oder absteigend sortieren"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
+"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 ""
 "Die Breite der Dateinamenspalte im Ordnerfenster. Bei 0 wird die Breite "
 "automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -702,7 +707,7 @@ msgstr ""
 "Die Breite der Dateigrößenspalte im VOrdnerenster. Bei 0 wird die Breite "
 "automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,7 +715,7 @@ msgstr ""
 "Die Breite der Eigentümerspalte im Ordnerfenster. Bei 0 wird die Breite "
 "automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -718,7 +723,7 @@ msgstr ""
 "Die Breite der Gruppenspalte im Ordnerfenster. Bei 0 wird die Breite "
 "automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -726,86 +731,86 @@ msgstr ""
 "Die Breite der Datumsspalte im Ordnerfenster. Bei 0 wird die Breite "
 "automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Die Breite der Spalte für Dateieigenschaften im Ordnerfenster. Bei 0 wird die "
-"Breite automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
+"Die Breite der Spalte für Dateieigenschaften im Ordnerfenster. Bei 0 wird "
+"die Breite automatisch angepasst. Bei -1 wird diese Spalte nicht angezeigt"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Die Farbe der Befehle, die zum Server gesendet werden"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Die Farbe der Befehle, die vom Server empfangen werden"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Die Farbe der Fehlermeldungen"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Die Farbe der restlichen Meldungen"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
 #
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
 #
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokal"
 
 #
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Übertragungsrate wird auf %.2f KB/s begrenzt\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME konnte nicht auf »%s« gesetzt werden. Fällt zurück zu »%s«\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Ordnerliste %s wird aus dem Cache geladen (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Ordnerliste %s wird von der Gegenstelle geladen (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -814,109 +819,109 @@ msgstr ""
 "Warnung: Der Pfad der Datei »%s« wird entfernt. Der zu entfernende Pfad (%s) "
 "entspricht nicht dem momentanen Ordner (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Fehler: In den Cache konnte nicht geschrieben werden: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Fehler: Lesezeichen %s konnte nicht gefunden werden\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Lesezeichen-Fehler: Das Lesezeichen %s hat keinen Rechnernamen\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Das Protokoll »%s« wird zurzeit nicht unterstützt.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Rekursive symbolische Verknüpfung %s wurde gefunden\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Fehler: Gegenstelle %s brach ab. Max. Wahlwiederholung erreicht... Abbruch\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Fehler: Gegenstelle %s brach ab. In %d Sek. wird erneut verbunden\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Fehler: »close on exec«-Markierung kann nicht gesetzt werden: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Master-PTY %s kann nicht geöffnet werden: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Socketpaar kann nicht angelegt werden: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Fehler: ssh kann nicht ausgeführt werden: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Weiterer Prozess kann nicht erzeugt werden: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy-Rechnername:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Firewall-Rechnername"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy-Port:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Verbindungsport der Firewall"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxy-Nutzername:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Ihr Firewall-Nutzername"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxy-Passwort:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ihr Firewall-Passwort"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 verwenden"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Wollen Sie HTTP/1.1 oder HTTP/1.0 verwenden?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -925,65 +930,65 @@ msgstr ""
 "Falsche Antwort vom Server empfangen, Verbindungsabbruch\n"
 "Ungültige \"Chunk\" Größe '%s' von der Gegenstelle erhalten\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Verbindung mit Gegenstelle %s wird beendet\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Dateiübertragung ab der Stelle starten"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Datei %s nicht empfangen werden\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Ordnerliste wird empfangen …\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Falsche Antwort vom Server empfangen, Verbindungsabbruch\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE-Befehl"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "benutzername rechner"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "benutzername rechner:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "Legitimieren"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "benutzername rechner port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "benutzername rechner NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP-Proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Email-Adresse:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -991,40 +996,40 @@ msgstr ""
 "Dies ist das Passwort, welches beim Anmelden an einem »anonymen« FTP-Server "
 "benutzt wird"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy-Benutzerkonto:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Ihr Firewall-Benutzerkonto (optional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Typ des Proxy-Servers:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
-"2 character replacement string prefixed by a % that will be replaced with the "
-"proper data. The first character can be either p for proxy or h for the 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"
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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 ""
 "Dies legt fest, wie Ihr Proxyserver die Anmeldung erwartet. Sie können eine "
-"zwei Zeichen lange Zeichenkette angeben, der ein %-Zeichen vorangestellt ist. "
-"Diese swird ersetzt durch die eigentlichen Daten. Das erste Zeichen kann "
-"entweder p für Proxy oder h für FTP Servername sein. Das zweite Zeichen kann "
-"u (Benutzer), p (Passwort), h (Servername), o (Port) oder a (Konto) sein. "
-"Beispielsweise können Sie %pu angeben, um den Proxybenutzer festzulegen"
+"zwei Zeichen lange Zeichenkette angeben, der ein %-Zeichen vorangestellt "
+"ist. Diese swird ersetzt durch die eigentlichen Daten. Das erste Zeichen "
+"kann entweder p für Proxy oder h für FTP Servername sein. Das zweite Zeichen "
+"kann u (Benutzer), p (Passwort), h (Servername), o (Port) oder a (Konto) "
+"sein. Beispielsweise können Sie %pu angeben, um den Proxybenutzer festzulegen"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV-Adresse ignorieren"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1032,15 +1037,15 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 "Wenn dies aktiviert ist, wird das PASV IP-Adressfeld des entfernten FTP-"
-"Servers ignoriert und stattdessen die IP-Adresse des Hosts genutzt. Dies wird "
-"häufig für Router benötigt, die ihre interne anstatt der externen IP-Adresse "
-"in einer PASV-Antwort angeben."
+"Servers ignoriert und stattdessen die IP-Adresse des Hosts genutzt. Dies "
+"wird häufig für Router benötigt, die ihre interne anstatt der externen IP-"
+"Adresse in einer PASV-Antwort angeben."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive Dateiübertragungen"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1054,14 +1059,14 @@ msgstr ""
 "Sie diese einschalten. Sie sollten diese Option generell einschalten, außer "
 "Sie wollen zu einem veralteten FTP-Server verbinden, der diese Möglichkeit "
 "nicht unterstützt. Falls diese Option deaktiviert ist, wird gFTP einen Port "
-"auf der Klientenseite öffnen und der entfernte Server wird versuchen, dorthin "
-"zu verbinden."
+"auf der Klientenseite öffnen und der entfernte Server wird versuchen, "
+"dorthin zu verbinden."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Verknüpfungen auf der Gegenstelle folgen (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1073,354 +1078,347 @@ msgstr ""
 "lassen. Sie sollten es nur ausschalten, wenn der entfernte FTP-Server die "
 "Option -L des LIST-Befehls nicht unterstützt"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Dateien im Textmodus übertragen"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
-"Wenn Sie Textdateien von Windows- zu UNIX-Rechnern oder umgekehrt übertragen, "
-"dann sollten Sie dies einschalten. Jedes System stellt Zeilenumbrüche in "
-"Textdateien unterschiedlich dar. Wenn Sie von UNIX- zu UNIX-Rechnern "
-"übertragen, dann können Sie dies ausgeschaltet lassen. Wenn Sie Binärdaten "
-"laden, Sollten sie dies ausschalten."
+"Wenn Sie Textdateien von Windows- zu UNIX-Rechnern oder umgekehrt "
+"übertragen, dann sollten Sie dies einschalten. Jedes System stellt "
+"Zeilenumbrüche in Textdateien unterschiedlich dar. Wenn Sie von UNIX- zu "
+"UNIX-Rechnern übertragen, dann können Sie dies ausgeschaltet lassen. Wenn "
+"Sie Binärdaten laden, Sollten sie dies ausschalten."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ungültige Antwort »%c« vom Server erhalten.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "IPv4-Socket konnte nicht angelegt werden: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "IP-Adresse kann in der PASV-Antwort nicht gefunden werden »%s«\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
-"IP-Adresse in der PASV-Antwort wird ignoriert, Verbindung mit %d.%d.%d.%d:%d\n"
+"IP-Adresse in der PASV-Antwort wird ignoriert, Verbindung mit %d.%d.%d.%d:"
+"%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Datenverbindung kann nicht erstellt werden: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Socketname konnte nicht ermittelt werden: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Kein Port konnte gebunden werden: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Auf Port %d kann nicht gelauscht werden: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6-Socket konnte nicht angelegt werden: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Fehler: Es sieht nicht so aus, als ob wir mittels IPv6 verbunden wären. "
 "Verbindung abgebrochen.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Ungültige EPSV-Antwort »%s«\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Adresse des lokalen Sockets konnte nicht ermittelt werden: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Verbindung vom Server kann nicht angenommen werden: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "Total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Warnung: Liste %s kann nicht analysiert werden\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "IP-Adresse von %s wird gesucht\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "IP-Adresse von Rechnername %s kann nicht gefunden werden: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Socket kann nicht angelegt werden: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "%s wird versucht:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Keine Verbindung zu %s möglich: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Verbindung mit %s erfolgreich:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Dienstname %s/tcp kann nicht gefunden werden. Bitte die Dienstedatei "
 "überprüfen\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Verbindung zu %s wegen Zeitüberschreitung beendet\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Socketmerker konnten nicht gefunden werden: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Socket konnte nicht auf nichtblockierend gesetzt werden: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH-Programmname:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Pfad zum SSH-Programm"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Zusätzliche SSH-Parameter:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Zusätzliche Parameter, welche dem SSH-Programm übergeben werden"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH-Benutzername/Passwort erforderlich"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Benutzernamen/Passwort bei SSH-Verbindungen erforderlich"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Programm %s wird gestartet\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Eingeben des Kennworts für RSA-Schlüssel"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Eingeben des Kennworts für Schlüssel '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Passwort"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "Passwort"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nein)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE eingeben:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID-Passwort eingeben:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Fehler: Ein falsches Passwort wurde eingegeben\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protokollinitialisierung\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokollversion %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Öffnen %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d:  Schließen\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Ordner %s wird geöffnet \n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Ordner wird gelesen\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Datei %s wird gelöscht\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Ordner %s wird erstellt\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Ordner %s wird gelöscht\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Tatsächlicher Pfad %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Dateiattribute\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Keine solche Datei oder Ordner"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Zugriff verboten"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Fehlschlag"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Fehlerhafte Nachricht"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Keine Verbindung"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Vorgang nicht unterstützt"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Unbekannte Nachricht vom Server"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Fehler: Nachrichtengröße %d zu groß\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Fehler: Nachrichtengröße %d vom Server zu groß\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1428,41 +1426,41 @@ msgstr ""
 "Beim Aufbau der SSH-Verbindung zum entfernten Server ist ein Fehler "
 "aufgetreten. Die Fehlermeldung des entfernten Servers lautet: \n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH-Verbindung zu %s  wird hergestellt\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Erfolgreich mit SSH Server %s verbunden\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-Engine"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL-Entropie-Datei:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL-Entropie-Datei"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy-Seed-Länge:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Maximale Anzahl von Bytes, um die SSL-Maschine zu impfen"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL-Gegenstelle wird überprüft"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1475,11 +1473,11 @@ msgstr ""
 "Subject = %s\n"
 "Error %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Zertifikat der Gegenstelle konnte nicht erhalten werden: %s\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1489,59 +1487,59 @@ msgstr ""
 "überein, zu dem die Verbindung hergestellt werden sollte. Verbindung "
 "abgebrochen.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL-Bibliothek konnte nicht initialisiert werden\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Fehler beim Laden der voreingestellten SSL-Zertifikate\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "Fehler beim Setzen der Verschlüsselungsalgorithmen (kein gültiger "
 "Algorithmus)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "FEHLER: SSL-Engine nicht initialisiert\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Fehler beim Aufbau der SSL-Verbindung (BIO object)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Fehler beim Aufbau der SSL-Verbindung (SSL object)\n"
 
 # c-format
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Fehler mit dem Zertifikat der Gegenstelle: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Aktion abgebrochen\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "%d Sekunden Wartezeit bis zum Wiederwahlversuch\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 ""
-"Auf gFTP gibt es KEINERLEI GARANTIE; weitere Einzelheiten entnehmen Sie bitte "
-"der Datei COPYING. Dies ist freie Software und ihre Weiterverbreitung unter "
-"bestimmten Bedingungen wird begrüßt; lesen Sie hierzu auch die Datei "
+"Auf gFTP gibt es KEINERLEI GARANTIE; weitere Einzelheiten entnehmen Sie "
+"bitte der Datei COPYING. Dies ist freie Software und ihre Weiterverbreitung "
+"unter bestimmten Bedingungen wird begrüßt; lesen Sie hierzu auch die Datei "
 "COPYING.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Deutsche Bearbeitung von\n"
@@ -1551,69 +1549,69 @@ msgstr ""
 "Frank Arnold <frank scirocco-5v-turbo de>\n"
 "Mario Blättermann <mariobl gnome org>"
 
-#: ../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
+#: 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 "Fehler: Nicht mit einer Gegenstelle verbunden\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "Verwendung: chmod <Modus> <Datei>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "Verwendung: rename <alter Name> <neuer Name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "Verwendung: delete <Datei>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "Verwendung: rmdir <Ordner>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "Verwendung: site <site Befehl>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "Verwendung: mkdir <neuer Ordner>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "Verwendung: chdir <Ordner>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Ungültiges Argument\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Löscht den Ordnerzwischenspeicher\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "Verwendung: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "Verwendung: set [Variable = Wert]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Fehler: Variable %s ist keine gültige Konfigurationsvariable.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Fehler: Variable %s ist in der Textversion von gFTP nicht verfügbar\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1621,249 +1619,249 @@ msgstr ""
 "Unterstützte Befehle:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "Verwendung: %s <Dateimaske>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Informationen zu gFTP anzeigen"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Setzt den aktuellen Dateiübertragungsmodus auf Ascii (Nur für FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Setzt den aktuellen Dateiübertragungsmodus auf Binär (Nur für FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Wechselt den Arbeitsordner auf der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Ändert die Rechte einer Datei auf der Gegenstelle"
 
 #
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "aufräumen"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Verfügbare Optionen: Zwischenspeicher"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Unterbricht von der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Löscht eine Datei der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Zeigt die Ordnerliste für den aktuellen Ordner der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Übertragt Datei(en) von der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Zeigt diesen Hilfebildschirm"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Wechselt den lokalen Arbeitsordner"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Ändert Rechte einer lokalen Datei"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Löscht eine lokale Datei"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Zeigt eine Ordnerliste für den aktuellen lokalen Ordner"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Erzeugt einen lokalen Ordner"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Zeigt den aktuellen lokalen Ordner"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Benennt eine lokale Datei um"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Löscht einen lokalen Ordner"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Erzeugt Ordner auf der Gegenstelle:"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Sendet lokale Datei(en)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Öffnet eine Verbindung zu einer Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Zeigt aktuellen Ordner der Gegenstelle"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP beenden"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Eine Datei auf der Gegenstelle umbenennen"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Ordner auf der Gegenstelle löschen"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
@@ -1871,65 +1869,64 @@ msgstr ""
 "durch set var=val"
 
 #
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Ausführen eines site-spezifischen Kommandos"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Fehler: Befehl nicht erkannt\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s erfolgreich mit %.2f KB/s übertragen\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Überspringe Datei %s auf Rechner %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Übertragung von Rechner %s wird gestoppt\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s konnte nicht von %s heruntergeladen werden\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"%d Dateien oder Ordner konnten nicht übertragen werden. Überprüfen Sie in den "
-"Protokolldateien, um welche Objekte es sich dabei handelt."
+"%d Dateien oder Ordner konnten nicht übertragen werden. Überprüfen Sie in "
+"den Protokolldateien, um welche Objekte es sich dabei handelt."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Bitte klicken Sie zuerst auf »Stop«, bevor Sie etwas anderes machen\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Gehe zu Lesezeichen"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 "Lesezeichen hinzufügen: Sie müssen einen Namen für das Lesezeichen angeben\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
@@ -1937,15 +1934,15 @@ msgstr ""
 "Name\n"
 " bereits existiert\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Lesezeichen hinzufügen: Sie müssen einen Rechnernamen angeben\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1955,31 +1952,31 @@ msgstr ""
 "Geben Sie / an, um es in ein Untermenü abzulegen\n"
 "(z.B. Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Sie müssen einen Namen für das Lesezeichen angeben."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Geben Sie den Namen des zu erstellenden Ordners an"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Neuer Eintrag"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Geben Sie den Namen des zu erstellenden Eintrages an"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1988,106 +1985,99 @@ msgstr ""
 "Sind Sie sicher, dass Sie Lesezeichen\n"
 "%s und seine Untereinträge löschen möchten?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Lesezeichen löschen"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Eintrag bearbeiten"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Rechnername:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Ordner der Gegenstelle:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokaler Ordner:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Nutzerkonto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Anonym anmelden"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Abbrechen  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Datei"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Datei/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Datei/Neuer _Ordner …"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Datei/Neuer _Eintrag …"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Datei/_Löschen"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Datei/Ei_genschaften …"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Datei/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Datei/_Schließen"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Lesezeichen bearbeiten"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Dateirechte"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2096,92 +2086,91 @@ msgstr ""
 "Beachte:\n"
 "Nicht alle FTP-Server unterstützen den dazu nötigen chmod-Befehl"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Besonderes"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Eigentümer"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lesen"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Schreiben"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Ausführen"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Andere"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Sind Sie sicher, dass Sie diese %ld Dateien und  %ld Ordner löschen möchten?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Sind Sie sicher, dass Sie diese %ld Dateien löschen möchten?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Sind Sie sicher, dass Sie diese %ld Ordner löschen möchten?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Dateien/Ordner löschen"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s wurde empfangen\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Ziehen-und-Ablegen"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Beenden"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2189,469 +2178,456 @@ msgstr ""
 "Momentan werden noch Dateien übertragen. Sind Sie sicher, dass Sie beenden "
 "möchten?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Ort öffnen"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Geben Sie eine Adresse ein, zu der verbunden werden soll"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Fenster _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Fenster _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_ASCII"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binär"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Datei/_Eigenschaften …"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Beenden"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/L_okal"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokal/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokal/_Ort öffnen …"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokal/_Trennen"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokal/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokal/Datei_maske ändern …"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokal/Ausge_wählte anzeigen"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokal/_Alles auswählen"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokal/Alle Dateien auswählen"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokal/Alles abwählen"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokal/Ordnerliste speichern …"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokal/SITE-Befehl senden …"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokal/_Ordner wechseln"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokal/_Rechte ändern …"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Datei/_Neuer Ordner …"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokal/_Umbenennen …"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokal/_Löschen …"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokal/_Bearbeiten …"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokal/Bet_rachten …"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokal/A_ktualisieren"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Gegenstelle"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Gegenstelle/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Gegenstelle/Ort ö_ffnen …"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Gegenstelle/_Trennen"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Gegenstelle/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Gegenstelle/Datei_maske ändern …"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Gegenstelle/Ausge_wählte anzeigen"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Gegenstelle/_Alles auswählen"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Gegenstelle/Alle Dateien auswählen"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Gegenstelle/Alles abwählen"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Gegenstelle/Ordnerliste speichern …"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "telle/SITE-Befehl senden …"
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Gegenstelle/_Ordner wechseln"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Gegenstelle/_Rechte ändern …"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Datei/_Neuer Ordner …"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Gegenstelle/Umbe_nennen …"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Gegenstelle/_Löschen …"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Gegenstelle/_Bearbeiten …"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Gegenstelle/Bet_rachten …"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Gegenstelle/A_ktualisieren"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Lesezeichen"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Lesezeichen/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Lesezeichen/Lesezeichen _hinzufügen"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Lesezeichen/Lesezeichen _bearbeiten"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Lesezeichen/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Übertragung"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Übertragung/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Übertragung/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Übertragung/S_top"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Übertragung/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Übertragung/Datei über_springen"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Übertragung/Datei _löschen"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Übertragung/Datei nach _oben schieben"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Übertragung/Datei nach _unten schieben"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Übertragung/Dateien _empfangen"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Übertragung/Dateien _senden"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Protokoll"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Protokoll/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Protokoll/_Löschen"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Lokal/Bet_rachten …"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Protokoll/Protokoll _speichern …"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Werkzeuge"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Werkzeuge/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Werkzeuge/_Fenster vergleichen"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Werkzeuge/Cache _löschen"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Hilfe"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Hilfe/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Hilfe/_Info"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Rechner: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Rechner: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Benutzername: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "Be_nutzername: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Passwort: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Befehl: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Größe"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attribute"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 "Fehler: Sie müssen einen Rechner eingeben, um eine Verbindung herzustellen\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Benutzernamen eingeben"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Bitte geben Sie Ihren Benutzernamen für diese Gegenstelle ein"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Bitte geben Sie Ihr Passwort für diese Gegenstelle ein"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Vorgang abgebrochen... Sie müssen eine Zeichenkette eingeben\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Ordner erstellen"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Geben Sie den Namen des zu erstellenden Ordners ein"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "In was möchten Sie %s umbenennen?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Geben Sie site-spezifische Befehle ein"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE voranstellen"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Übersprungen"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Warte …"
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Wiederaufnehmen"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Überspringen"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Aktion"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Übertrage Dateien"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2659,61 +2635,61 @@ msgstr ""
 "Die folgende(n) Datei(en) existieren auf beiden Rechnern\n"
 "Bitte wählen Sie, wie Sie fortfahren möchten"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Datei überspringen"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Alle abwählen"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Dateimaske ändern: Operation abgebrochen... Sie müssen eine Zeichenkette "
 "eingeben\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Dateimaske ändern"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Geben Sie die neue Dateimaske ein"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Fehler: %s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Ordnerliste speichern"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Fehler: Fehler beim Schreiben in %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Protokolldatei in %s wurde erfolgreich geschrieben\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Protokoll speichern"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2722,11 +2698,11 @@ msgstr ""
 "Lizenzbestimmungsdatei COPYING kann nicht gefunden werden. Bitte stellen Sie "
 "sicher, dass Sie sich entweder in %s oder in %s befindet"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Info zu gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2737,27 +2713,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masney gftp org>\n"
 "Offizielle Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Info"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Lizenzbestimmung"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr " Schließen "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Fenster vergleichen"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Verbindung zur Gegenstelle trennen"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2766,72 +2738,56 @@ msgstr ""
 "Wenn das Feld »Rechner« leer ist, wird ein Dialog angezeigt, der die Eingabe "
 "einer URL erlaubt."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (im Cache) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Fehler beim Öffnen der Datei %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Nicht mit einer Gegenstelle verbunden\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Diese Eigenschaft kann mit diesem Protokoll nicht benutzt werden\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Sie dürfen nur einen Eintrag auswählen\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Sie müssen mindestens einen Eintrag auswählen\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Ändern"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr " Ja "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr " Nein "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Ordnerlisten werden empfangen"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " Anhalten "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2840,109 +2796,90 @@ msgstr ""
 "%ld Ordner\n"
 "und %ld Dateien empfangen"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-Fehler: Datei %s kann nicht in %s oder in %s gefunden werden\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Rechner bearbeiten"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Rechner hinzufügen"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domäne"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Netzwerkadresse"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Netzwerkadresse:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Netzmaske"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etzmaske:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domäne:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netzmaske"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokale Rechner"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Optionen"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Übernehmen"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Dateinamen werden empfangen…"
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Verbinde …"
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Dateien empfangen: Nicht mit einer Gegenstelle verbunden\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Fehler: Kindprozess %d lieferte %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Kindprozess %d erfolgreich zurückgekehrt\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Fehler: Kindprozess %d wurde nicht richtig beendet\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
-msgstr "Fehler: Informationen über Datei %s können nicht ermittelt werden: %s\n"
+msgstr ""
+"Fehler: Informationen über Datei %s können nicht ermittelt werden: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Datei %s wurde nicht verändert\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2951,122 +2888,163 @@ msgstr ""
 "Datei %s wurde verändert.\n"
 "Soll sie hochgeladen werden?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Datei bearbeiten"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s von %s mit %.2f KB/s gesendet, verbleibende Zeit ca. %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "%s von %s wird mit %.2f KB/s empfangen, verbleibende Zeit ca. %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "%s von %s gesendet, Übertragung steht still, verbleibende Zeit unbekannt"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Empfange %s von %s, Übertragung steht still, verbleibende Zeit unbekannt"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Unbekannter Prozentsatz fertiggestellt. (Datei %ld von %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% abgeschlossen, geschätzte verbleibende Zeit %02d:%02d:%02d. (Datei %ld "
 "von %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Dateinamen werden empfangen …%s Bytes"
 
-#: ../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
+#: 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 "Es sind keine Dateiübertragungen ausgewählt\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Betrachten"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Betrachten: %s ist ein Ordner. Inhalt kann nicht betrachtet werden.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Bearbeiten: %s ist ein Ordner. Kann nicht bearbeitet werden\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Bearbeiten: Sie müssen unter FTP->Optionen einen Editor angeben\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Betrachten: Kann keinen weiteren Prozess abspalten: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Programm wird gestartet: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s wird mit %s geöffnet\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Datei %s betrachten\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Betrachten: Datei %s kann nicht geöffnet werden: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kontrollterminal %s kann nicht geöffnet werden\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Benutzername [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s existiert bereits. (%s Quelldateigröße, %s Zieldateigröße):\n"
-"(o) überschreiben, (r) fortsetzen, (s) überspringen, (O) alle überschreiben,\n"
+"(o) überschreiben, (r) fortsetzen, (s) überspringen, (O) alle "
+"überschreiben,\n"
 "(R) alle fortsetzen, (S) alle überspringen: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Abbrechen  "
+
+#~ msgid "Host: "
+#~ msgstr "Rechner: "
+
+#~ msgid "User: "
+#~ msgstr "Benutzername: "
+
+#~ msgid "  Close  "
+#~ msgstr " Schließen "
+
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "  Yes  "
+#~ msgstr " Ja "
+
+#~ msgid "  No  "
+#~ msgstr " Nein "
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Network Address"
+#~ msgstr "Netzwerkadresse"
+
+#~ msgid "_Edit"
+#~ msgstr "_Bearbeiten"
+
+#~ msgid "Apply"
+#~ msgstr "Übernehmen"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
@@ -3087,9 +3065,9 @@ msgstr ""
 #~ "Systemeinstellung zu UTF-8: %s\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";
+#~ ">. 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 ""
 #~ ">. Wenn Sie Fragen, Kommentare oder Anregungen zu diesem Programm haben, "
 #~ "schreiben Sie bitte eine E-Mail an mich. Besuchen Sie auch die "
diff --git a/po/dz.po b/po/dz.po
index 39e560c..7e4a35b 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,941 +6,899 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-03-27 21:53+0530\n"
 "Last-Translator: yangka <yanang_ka hotmail com>\n"
 "Language-Team: Dzongkha <pgeyleg dit gov bt>\n"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "ནུས་མེད་ URL %s\n"
 
-#: ../lib/cache.c:50
-#: ../lib/cache.c:64
-#: ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"ཡིག་འབྲུའི་ཆ་ཚན་ %s: %s ལུ་ཡིག་འབྲུའི་ཆ་ཚན་ %s ནང་ལས་ '%s' ཡིག་རྒྱུན་གཞི་བསྒྱུར་འབད་ནི་ལུ་འཛོལ་"
+"བ།\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:488
 #, 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:441
 #, 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 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"
 
-#: ../lib/config_file.c:295
-#: ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP ཉེན་བརྡ: གོམ་འགྱོ་ནིའི་གྲལ་ཐིག་ %d དེབ་རྟགས་ཚུ་གི་ཡིག་སྣོད་ %s ནང་ལུ།\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ཉེན་བརྡ: གྲལ་ཐིག་ %d འདི་ལུ་སྒྲུབ་རྟགས་ཚུ་ལངམ་སྦེ་མིན་འདུག།\n"
 
-#: ../lib/config_file.c:505
-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 
"དབྱེ་ཚན་འདི་གིས་ཉེ་གནས་སབ་ནེཊི་ལུ་ཡོད་མི་ཧོསིཊི་ཚུ་གསལ་བཀོད་འབདཝ་ཨིནམ་དང་(ཐོབ་ཚུགས་པ་ཅིན་)པོརོག་སི་སར་བར་ལས་ཕྱི་གར་འགྱོ་མི་དགོ།
 ཚིག་སྦྱོར: པོརོག་སི་ལག་ལེན་མ་འཐབ་=ཌོ་མེན་ ཡང་ན་ པོརོག་སི་ལག་ལེན་མ་འཐབ་=ཡོངས་འབྲེལ་ཨང་/ནེཊི་མཱསིཀ"
+#: 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 ""
+"དབྱེ་ཚན་འདི་གིས་ཉེ་གནས་སབ་ནེཊི་ལུ་ཡོད་མི་ཧོསིཊི་ཚུ་གསལ་བཀོད་འབདཝ་ཨིནམ་དང་(ཐོབ་ཚུགས་པ་ཅིན་)པོརོག་སི་"
+"སར་བར་ལས་ཕྱི་གར་འགྱོ་མི་དགོ། ཚིག་སྦྱོར: པོརོག་སི་ལག་ལེན་མ་འཐབ་=ཌོ་མེན་ ཡང་ན་ པོརོག་སི་ལག་ལེན་མ་"
+"འཐབ་=ཡོངས་འབྲེལ་ཨང་/ནེཊི་མཱསིཀ"
 
-#: ../lib/config_file.c:508
-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: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"
+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
-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 གི་དོན་ལུ་ཡིག་སྣོད་དེབ་རྟགས་ཚུ། Copyright (C) ༡༩༩༨-༢༠༠༣ བརཱའིན་མཱས་ནེ་ <masneyb gftp org>. 
ཉེན་བརྡ: ཁྱོད་ཀྱིས་ཡིག་སྣོད་འདི་ལུ་གང་རུང་གི་བསམ་བཀོད་ཚུ་ཁ་སྐོང་འབད་བ་ཅིན་ཚབ་སྲུང་འབད་འོང་།"
+#: 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 གི་དོན་ལུ་ཡིག་སྣོད་དེབ་རྟགས་ཚུ། Copyright (C) ༡༩༩༨-༢༠༠༣ བརཱའིན་མཱས་ནེ་ <masneyb gftp "
+"org>. ཉེན་བརྡ: ཁྱོད་ཀྱིས་ཡིག་སྣོད་འདི་ལུ་གང་རུང་གི་བསམ་བཀོད་ཚུ་ཁ་སྐོང་འབད་བ་ཅིན་ཚབ་སྲུང་འབད་འོང་།"
 
-#: ../lib/config_file.c:734
-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 someone standing over your shoulder while you're editing 
this file. Prior to this, all passwords were stored in plaintext."
-msgstr "དྲན་འཛིན: ཆོག་ཡིག་ཚུ་ནང་ན་ཡོད་མི་གི་ཡིག་སྣོད་འདི་གེ་ར་སླ་བསྲེ་ནུག། 
འ་ནི་ཨཱལ་གོ་རི་དམ་འདི་མཐའ་བཙན་མིན་འདུག། 
འ་ནི་འདི་ཁྱོད་ཀྱིས་ཡིག་སྣོད་འདི་ནང་ཆོག་ཡིག་ཐོ་བཀོད་འབདཝ་ད་རྒྱབ་ཁ་ལས་བལྟ་སྡོད་མི་ཚུ་གིས་འཇམ་ཏོང་ཏོ་སྦེ་སེམས་ཁར་བཞག་ནི་ལས་སྤང་ནིའི་དོན་ལུ་ཨིན།
 འདི་གི་གོང་ལུ་ ཆོག་ཡིག་ཚུ་ཆ་མཉམ་ཚིག་ཡིག་རྐྱང་པོ་ནང་ལུ་བསག་མཛོད་འབད་འདི་ཡོད།"
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+"དྲན་འཛིན: ཆོག་ཡིག་ཚུ་ནང་ན་ཡོད་མི་གི་ཡིག་སྣོད་འདི་གེ་ར་སླ་བསྲེ་ནུག། འ་ནི་ཨཱལ་གོ་རི་དམ་འདི་མཐའ་བཙན་"
+"མིན་འདུག། འ་ནི་འདི་ཁྱོད་ཀྱིས་ཡིག་སྣོད་འདི་ནང་ཆོག་ཡིག་ཐོ་བཀོད་འབདཝ་ད་རྒྱབ་ཁ་ལས་བལྟ་སྡོད་མི་ཚུ་གིས་འཇམ་"
+"ཏོང་ཏོ་སྦེ་སེམས་ཁར་བཞག་ནི་ལས་སྤང་ནིའི་དོན་ལུ་ཨིན། འདི་གི་གོང་ལུ་ ཆོག་ཡིག་ཚུ་ཆ་མཉམ་ཚིག་ཡིག་རྐྱང་པོ་ནང་"
+"ལུ་བསག་མཛོད་འབད་འདི་ཡོད།"
 
-#: ../lib/config_file.c:846
-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 གི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད།Copyright (C) ༡༩༩༨-༢༠༠༣ བརཱའིན་མཱས་ནེ་<masneyb gftp org> ཉེན་བརྡ: 
ཁྱོད་ཀྱིས་ཡིག་སྣོད་འདི་ལུ་གང་རུང་གི་བསམ་བཀོད་ཚུ་ཁ་སྐོང་འབད་བ་ཅིན་ཚབ་སྲུང་འབད་འོང་། 
ཐོ་བཀོད་ལུ་ཁོ་རའི་བསམ་བཀོད་ནང་ལུ་ (*) ཡོད་པ་ཅིན་ ཁྱོད་ཀྱིས་ gFTP ནང་ལུ་བསྒྱུར་བཅོས་འབད་མི་ཚུགས།"
+#: 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 གི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད།Copyright (C) ༡༩༩༨-༢༠༠༣ བརཱའིན་མཱས་ནེ་<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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "འཛོལ་བ: ཡིག་སྣོད་ %s བཙུགས་སྐྱེལ་འབད་མི་བཏུབ།\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "འཛོལ་བ:  %s: %s་ ཡིག་སྣོད་ལུ་འབྲི་མི་བཏུབ།\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "འཛོལ་བ: ཡིག་སྣོད་ %s ཁ་བསྡམས་ནིའི་འཛོལ་བ།\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "ཨེཕ་ཨེས་པི་སར་བར་ %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 "མ་ཤེསཔ།"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "%s: %s ཨེཕ་ཨེས་པི་ སྣོད་ཐོ་ཐོ་བཀོད་འབད་ནི་ཐོབ་མ་ཚུགས།\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "%s ལུ་སྣོད་ཐོ་འདི་མཐར་འཁྱོལཝ་སྦེ་བསྒྱུར་བཅོས་འབད་ཡོ།\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 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:304
 #, 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:308
 #, 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
-msgid "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr 
"བར་བཤོལ་འབད་ནིའི་མཐུད་ལམ་ནང་ལུ་ཨེས་ཨེས་ཨེལ་རྒྱབ་སྐྱོར་འདི་ཕྱོགས་སྒྲིག་མ་འབདཝ་ལས་ཚུར་ཨེཕ་ཊི་པི་ཨེས་རྒྱབ་སྐྱོར་ཐོབ་མི་ཚུགས།\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"བར་བཤོལ་འབད་ནིའི་མཐུད་ལམ་ནང་ལུ་ཨེས་ཨེས་ཨེལ་རྒྱབ་སྐྱོར་འདི་ཕྱོགས་སྒྲིག་མ་འབདཝ་ལས་ཚུར་ཨེཕ་ཊི་པི་ཨེས་རྒྱབ་"
+"སྐྱོར་ཐོབ་མི་ཚུགས།\n"
 
-#: ../lib/https.c:91
-msgid "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr 
"བར་བཤོལ་འབད་ནིའི་མཐུད་ལམ་ནང་ལུ་ཨེས་ཨེས་ཨེལ་རྒྱབ་སྐྱོར་འདི་ཕྱོགས་སྒྲིག་མ་འབདཝ་ལས་ཚུར་ཨེཆ་ཊི་ཊི་པི་ཨེས་རྒྱབ་སྐྱོར་ཐོབ་མི་ཚུགས།\n"
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"བར་བཤོལ་འབད་ནིའི་མཐུད་ལམ་ནང་ལུ་ཨེས་ཨེས་ཨེལ་རྒྱབ་སྐྱོར་འདི་ཕྱོགས་སྒྲིག་མ་འབདཝ་ལས་ཚུར་ཨེཆ་ཊི་ཊི་པི་ཨེས་"
+"རྒྱབ་སྐྱོར་ཐོབ་མི་ཚུགས།\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "ད་ལྟོ་ལཱ་འབད་བཞིན་པའི་སྣོད་ཐོ་ %s འདི་ཐོབ་མ་ཚུགས།\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་འདི་ %s ལུ་མཐར་འཁྱོལཝ་སྦེ་བསྒྱུར་བཅོས་འབད་ཡོད།\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 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 "འཛོལ་བ:  %s གི་ཐབས་ལམ་འདི་ %o: %s ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 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 "འཛོལ་བ:  %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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ཅི་མེད།"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ཡིག་སྣོད།"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "ཚད།"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ལག་ལེན་པ།"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "སྡེ་ཚན།"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "ཚེས་གྲངས་ཆུ་ཚོད།"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "ཁྱད་ཆོས་ཚུ།"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "མར་འབབ།"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ཡར་འཛེགས།"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "ཡོངས་ཁྱབ།"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 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: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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "ལས་རིམ་ཞུན་དག་འབད:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ཡིག་སྣོད་ཚུ་ཞུན་དག་འབད་ནི་ལུ་སྔོན་སྒྲིག་ལས་རིམ།"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "དྲན་དེབ་མཐོ་ཤོས་ཝིན་ཌོ་གི་ཚད:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr " GTK+ འདྲེན་ལམ་འདི་གི་དོན་ལུ་བཱའིཊིས་ནང་གི་དྲན་དེབ་ཝིན་ཌོ་འདི་གི་མང་མཐའི་ཚད།"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "ཐག་རིང་གི་ཡིག་འབྲུའི་ཆ་ཚན་ཚུ:"
 
-#: ../lib/options.h:54
-msgid "This is a comma separated list of charsets to try to convert the remote messages to the current 
locale"
-msgstr 
"ད་ལྟོའི་ལོ་ཀེལ་འདི་ལུ་ཐག་རིང་གི་འཕྲིན་དོན་ཚུ་གཞི་བསྒྱུར་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་ནི་ལུ་འ་ནི་འདི་ཡིག་འབྲུའི་གཞི་སྒྲིག་ཚུ་གི་ལྷོད་རྟགས་སོ་སོ་འཕྱེལ་ཡོད་པའི་ཐོ་ཡིག་ཨིན།"
+#: lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
+msgstr ""
+"ད་ལྟོའི་ལོ་ཀེལ་འདི་ལུ་ཐག་རིང་གི་འཕྲིན་དོན་ཚུ་གཞི་བསྒྱུར་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་ནི་ལུ་འ་ནི་འདི་ཡིག་འབྲུའི་"
+"གཞི་སྒྲིག་ཚུ་གི་ལྷོད་རྟགས་སོ་སོ་འཕྱེལ་ཡོད་པའི་ཐོ་ཡིག་ཨིན།"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "ཐག་རིང་གི་ LC_TIME:"
 
-#: ../lib/options.h:58
-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:58
+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
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "འདྲ་མཛོད་ ཊི་ཊི་ཨེལ:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "དེ་ཚུ་དུས་ཡོལ་བའི་ཧེ་མ་འདྲ་མཛོད་ཐོ་བཀོད་ཚུ་བཞག་ནི་ལུ་སྐར་ཆ་ཚུ་གི་ཨང་།"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ཡིག་སྣོད་གནས་སོར་ཚུ་མཇུག་སྣོན་འབད།"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ཡོད་བཞིན་པའི་གུ་ལུ་ཡིག་སྣོད་གསརཔ་གནས་སོར་ཚུ་མཇུག་བསྣོན་འབད།"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ཐེངས་ཅིག་ལུ་གནས་སོར་གཅིག་འབད།"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ཐེངས་ཅིག་ལུ་གནས་སོར་གཅིག་རྐྱངམ་ཅིག་འབད?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "སྔོན་སྒྲིག་གིས་ཚབ་སྲུང་འབད་ནི།"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "ཡིག་སྣོད་གནས་སོར་ཚུ་བསྐྱར་ལོག་འབད་ནི་ལུ་ཆ་ཚན་ ཡང་ན་ སྔོན་སྒྲིག་གིས་ཚབ་སྲུང་འབད་བའི་ཡིག་སྣོད་ཚུ།"
+msgstr ""
+"ཡིག་སྣོད་གནས་སོར་ཚུ་བསྐྱར་ལོག་འབད་ནི་ལུ་ཆ་ཚན་ ཡང་ན་ སྔོན་སྒྲིག་གིས་ཚབ་སྲུང་འབད་བའི་ཡིག་སྣོད་ཚུ།"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ཡིག་སྣོད་གནང་བ་ཚུ་ཉམས་སྲུང་འབད།"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "གནས་སོར་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་གི་ཡིག་སྣོད་གནང་བ་ཚུ་ཉམས་སྲུང་འབད།"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ཡིག་སྣོད་ཀྱི་ཆུ་ཚོད་ཉམས་སྲུང་འབད།"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "གནས་སོར་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་གི་ཡིག་སྣོད་ཆུ་ཚོད་ཚུ་ཉམས་སྲུང་འབད།"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ཡིག་སྣོད་གནས་སོར་རེ་རེའི་ཤུལ་ལས་ཡང་སེལ་འབད།"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ཡིག་སྣོད་རེ་རེ་གནས་སོར་འབད་བའི་ཤུལ་ལས་ཐོ་ཡིག་སྒྲོམ་འདི་ཡང་སེལ་འབད།"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "དང་པ་སྣོད་ཐོ་ཚུ་དབྱེ་སེལ་འབད།"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "དང་པ་སྣོད་ཐོ་འདི་ཚུ་དང་དེ་ལས་ཡིག་སྣོད་ཚུ་བཙུགས།"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "གསང་བའི་ཡིག་སྣོད་ཚུ་སྟོན།"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "ཐོ་ཡིག་སྒྲོམ་ཚུ་ནང་ལུ་གསང་བའི་ཡིག་སྣོད་ཚུ་སྟོན།"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "གནས་སོར་གནས་ཚད་འདི་མགོ་མིང་ནང་སྦེ་སྟོན།"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "ཡིག་སྣོད་གནས་སོར་གནས་ཚད་འདི་མགོ་མིང་ཕྲ་རིང་ནང་ལུ་སྟོན།"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ཡིག་སྣོད་གནས་སོར་ཚུ་འགོ་བཙུགས།"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "དེ་ཚུ་གིས་མི་གྲལ་ཐོབ་ད་ཡིག་སྣོད་གནས་སོར་ཚུ་རང་བཞིན་གྱིས་འགོ་བཙུགསཔ་ཨིན།"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "ཇི་ཡུ་ཨའི་ ནང་ལུ་ལག་དེབ་བརྡ་བཀོད་ཚུ་འབད་བཅུག།"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "(ལས་འགན་ཚུ་ཚིག་ཡིག་བཟུམ་སྦེ་) ཇི་ཡུ་ཨའི་ ནང་ལུ་ལག་དེབ་བརྡ་བཀོད་ཚུ་ཐོ་བཀོད་འབད་བཅུག། "
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "ཧེ་མ་གི་སྣོད་ཐོ་འདི་ སེམས་ཁར་དྲན།"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "གློག་རིམ་འདི་ ཁ་བསྡམས་ཡོདཔ་ད་ མཇུག་གི་ཉེ་གནས་དང་ ཐག་རིང་གི་སྣོད་ཐོ་དེ་ སྲུངས་བཞག"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "ཐག་རིང་གི་སར་བར་ནང་ལས་མཐུད་ལམ་མཐུད་ནི།"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "གློག་རིམ་འདི་ འགོ་བཙུགས་ཡོད་པའི་སྐབས་ ཐག་རིང་གི་སར་བར་ལུ་རང་བཞིན་གྱིས་མཐུདཔ་ཨིན།"
 
-#: ../lib/options.h:120
-#: ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "ཡོངས་འབྲེལ།"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "ཡོངས་འབྲེལ་ངལ་མཚམས:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "ཡོངས་འབྲེལ་ཨིན་པུཊི་/ཨའུཊི་པུཊི་ གི་དོན་ལུ་ངལ་མཚམས་བསྒུག་དོ། འ་ནི་འདི་ལས་མེད་ངལ་མཚམས་མེན།"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "སླར་རྩོལ་ཚུ་མཐུད:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "རང་བཞིན་-སླར་རྩོལ་ཚུ་གིས་འབད་ནི་གི་ཨང་། ངེས་པ་མེདཔ་སྦེ་སླར་རྩོལ་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད།"
+msgstr ""
+"རང་བཞིན་-སླར་རྩོལ་ཚུ་གིས་འབད་ནི་གི་ཨང་། ངེས་པ་མེདཔ་སྦེ་སླར་རྩོལ་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད།"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "བསྒུག་ནིའི་དུས་ཚོད་ལུ་སླར་རྩོལ་འབད:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "སླར་རྩོལ་འབད་ནི་ཚུ་གི་བར་ན་བསྒུག་ནིའི་སྐར་ཆ་ཚུ་གི་ཨང་།"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "མཐོ་ཤོས་  KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
-msgstr "མང་མཐའ་ KB/s ཡིག་སྣོད་གནས་སོར་འདི་གིས་(གཞི་སྒྲིག་ ལས་ ༠ ལས་ ལྕོགས་མིན་བཟོ་ནི་) ཐོབ་ཚུགས།"
+msgstr ""
+"མང་མཐའ་ KB/s ཡིག་སྣོད་གནས་སོར་འདི་གིས་(གཞི་སྒྲིག་ ལས་ ༠ ལས་ ལྕོགས་མིན་བཟོ་ནི་) ཐོབ་ཚུགས།"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "སྡེབ་ཚན་གྱི་ཚད་གནས་སོར་འབད:"
 
-#: ../lib/options.h:144
-msgid "The block size that is used when transfering files. This should be a multiple of 1024."
-msgstr "ཡོག་སྣོད་ཚུ་གནས་སོར་འབདཝ་ད་ལག་ལེན་འཐབ་ཡོད་པའི་སྡེབ་ཚན་གྱི་ཚད། འ་ནི་འདི་ ༡༠༢༤ གི་སྣ་མང་སྦེ་འོང་དགོ།"
+#: lib/options.h:144
+#, fuzzy
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+"ཡོག་སྣོད་ཚུ་གནས་སོར་འབདཝ་ད་ལག་ལེན་འཐབ་ཡོད་པའི་སྡེབ་ཚན་གྱི་ཚད། འ་ནི་འདི་ ༡༠༢༤ གི་སྣ་མང་སྦེ་འོང་"
+"དགོ།"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "སྔོན་སྒྲིག་གནད་སྤེལ་ལམ་ལུགས:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "འ་ནི་འདི་གིས་སྔོན་སྒྲིག་གནད་སྤེལ་ལམ་ལུགས་ལག་ལེན་འཐབ་ནི་ལུ་གསལ་བཀོད་འབདཝ་ཨིན།"
 
-#: ../lib/options.h:151
-#: ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 གི་རྒྱབ་སྐྱོར་ལྕོགས་ཅན་བཟོ།"
 
-#: ../lib/options.h:159
-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=གནས་སོར་ཡིག་སྣོད།"
+#: lib/options.h:159
+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=གནས་སོར་ཡིག་སྣོད།"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་ཚུ་གི་ཐོ་ཡིག་སྒྲོམ་གྱི་སྔོན་སྒྲིག་རྒྱ་ཚད།"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "ཐག་རིང་གི་ཡིག་སྣོད་ཚུ་གི་ཐོ་ཡིག་སྒྲོམ་གྱི་སྔོན་སྒྲིག་རྒྱ་ཚད།"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ཉེ་གནས་/ཐག་རིང་གི་ཡིག་སྣོད་ཚུ་གི་ཐོ་ཡིག་སྒྲོམ་གྱི་སྔོན་སྒྲིག་མཐོ་ཚད།"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "གནས་སོར་ཐོ་ཡིག་སྒྲོམ་འདི་གི་སྔོན་སྒྲིག་མཐོ་ཚད།"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 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 "གནས་སོར་ཝིན་ཌོ་ནང་གི་ཡིག་སྣོད་ཀྱི་མིང་ཀེར་ཐིག་འདི་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གྱིས་ཚད་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད།"
+#: 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 ""
+"གནས་སོར་ཝིན་ཌོ་ནང་གི་ཡིག་སྣོད་ཀྱི་མིང་ཀེར་ཐིག་འདི་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གྱིས་ཚད་"
+"བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད།"
 
-#: ../lib/options.h:190
-#: ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "གིས་དབྱེ་སེལ་འབད་ནི་ལུ་སྔོན་སྒྲིག་ཀེར་ཐིག།"
 
-#: ../lib/options.h:193
-#: ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ཡར་འཛེགས་ ཡང་ན་ མར་འབབ་དབྱེ་སེལ་འབད།"
 
-#: ../lib/options.h:203
-#: ../lib/options.h:221
-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 "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཡིག་སྣོད་མིང་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གྱིས་ཚད་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:206
-#: ../lib/options.h:224
-msgid "The width of the size column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཚད་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:209
-#: ../lib/options.h:227
-msgid "The width of the user column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ལག་ལེན་པའི་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:212
-#: ../lib/options.h:230
-msgid "The width of the group column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་སྡེ་ཚན་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:215
-#: ../lib/options.h:233
-msgid "The width of the date column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཚེས་གྲངས་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:218
-#: ../lib/options.h:236
-msgid "The width of the attribs column in the file listboxes. Set this to 0 to have this column 
automagically resize. Set this to -1 to disable this column"
-msgstr "ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཁྱད་ཆོས་ཚུ་གི་ཀེར་ཐིག་གི་རྒྱ་ཚད། 
ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། 
ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
-
-#: ../lib/options.h:239
+#: lib/options.h:203 lib/options.h:221
+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 ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཡིག་སྣོད་མིང་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གྱིས་ཚད་བསྐྱར་"
+"བཟོ་འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་"
+"འབད།"
+
+#: lib/options.h:206 lib/options.h:224
+msgid ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཚད་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་ལུ་"
+"འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
+
+#: lib/options.h:209 lib/options.h:227
+msgid ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ལག་ལེན་པའི་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་"
+"འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
+
+#: lib/options.h:212 lib/options.h:230
+msgid ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་སྡེ་ཚན་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་ནི་"
+"ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
+
+#: lib/options.h:215 lib/options.h:233
+msgid ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཚེས་གྲངས་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་འབད་"
+"ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
+
+#: lib/options.h:218 lib/options.h:236
+msgid ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"ཡིག་སྣོད་ཐོ་ཡིག་སྒྲོམ་ནང་གི་ཁྱད་ཆོས་ཚུ་གི་ཀེར་ཐིག་གི་རྒྱ་ཚད། ཀེར་ཐིག་འདི་རང་བཞིན་མིག་འཕྲུལ་གིས་བསྐྱར་བཟོ་"
+"འབད་ནི་ལུ་འ་ནི་འདི་ ༠ ལུ་གཞི་སྒྲིག་འབད། ཀེར་ཐིག་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་འ་ནི་འདི་ -༡ ལུ་གཞི་སྒྲིག་འབད།"
+
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "སར་བར་ལུ་གཏང་ཡོད་མི་བརྡ་བཀོད་ཚུ་གི་ཚོས་གཞི།"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "སར་བར་ལས་ཐོབ་ཡོད་པའི་བརྡ་བཀོད་ཚུ་གི་ཚོས་གཞི།"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "འཛོལ་བའི་འཕྲིན་དོན་ཚུ་གི་ཚོས་གཞི།"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "དྲན་དེབ་འཕྲིན་དོན་ཚུ་གི་ངལ་འཚོ་བའི་ཚོས་གཞི།"
 
-#: ../lib/options.h:254
-#: ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "ཨེཕ་ཊི་པི།"
 
-#: ../lib/options.h:257
-#: ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "ཨེཕ་ཊི་པི་ཨེས།"
 
-#: ../lib/options.h:262
-#: ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "ཨེཆ་ཊི་ཊི་པི།"
 
-#: ../lib/options.h:265
-#: ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "ཨེཆ་ཊི་ཊི་པི་ཨེས།"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "ཉེ་གནས།"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "ཨེས་ཨེས་ཨེཆ་༢"
 
-#: ../lib/options.h:274
-#: ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "དེབ་རྟགས།"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "ཨེཕ་ཨེས་པི།"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, 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:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "'%s' ལུ་  LC_TIME གཞི་སྒྲིག་འབད་ནི་ལུ་འཛོལ་བ། '%s'ལུ་ལོག་འབུད་ནི།\n"
 
-#: ../lib/protocols.c:389
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "འདྲ་མཛོད་ (LC_TIME=%s) ནང་ལས་ %s ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་མངོན་གསལ་འབད་དོ།\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "སར་བར་ (LC_TIME=%s) ནང་ལས་ %s ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་མངོན་གསལ་འབད་དོ།\n"
 
-#: ../lib/protocols.c:461
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "ཡིག་འབྲུའི་ཆ་ཚན་ %s: %s ལུ་ཡིག་འབྲུའི་ཆ་ཚན་ %s ནང་ལས་ '%s' ཡིག་རྒྱུན་གཞི་བསྒྱུར་འབད་ནི་ལུ་འཛོལ་བ།\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, c-format
-msgid "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't match the current directory 
(%s)\n"
-msgstr "ཉེན་བརྡ: ཡིག་སྣོད་ '%s' ནང་ལས་འགྲུལ་ལམ་བཏོན་བཀོ་དོ། བཏོན་བཀོ་ཡོད་པའི་འགྲུལ་ལམ་ (%s) 
འདི་ད་ལྟོའི་སྣོད་ཐོ་ (%s) དང་མཐུན་སྒྲིག་མིན་འདུག།\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
+msgstr ""
+"ཉེན་བརྡ: ཡིག་སྣོད་ '%s' ནང་ལས་འགྲུལ་ལམ་བཏོན་བཀོ་དོ། བཏོན་བཀོ་ཡོད་པའི་འགྲུལ་ལམ་ (%s) འདི་ད་ལྟོའི་"
+"སྣོད་ཐོ་ (%s) དང་མཐུན་སྒྲིག་མིན་འདུག།\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "འཛོལ་བ: འདྲ་མཛོད་ %s ལུ་འབྲི་མི་བཏུབ།\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "འཛོལ་བ: %s དེབ་རྟགས་འཚོལ་མ་ཐོབ།\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, 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:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\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:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "ལོག་རིམ་བརྡ་མཚོན་པའི་འབྲེལ་མཐུད་ཐོབ་ཡོདཔ། %s\n"
 
-#: ../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
+#: lib/protocols.c:1531
 #, 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"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgstr ""
+"འཛོལ་བ: ཐག་རིང་གི་ས་ཁོངས་  %s གི་མཐུད་ལམ་བཏོག་ནུག། སླར་རྩོལ་འདི་མང་ཐོ་ལུ་ལྷོད་ཚར་ཡི་...བཤོལ་"
+"བཞག་དོ།\n"
 
-#: ../lib/protocols.c:2452
-#: ../lib/sshv2.c:1142
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "ཞབས་ཏོག་མིང་ %s/tcp ལུ་བལྟ་མི་ཚུགས། ཁྱོད་ཀྱི་ཞབས་ཏོག་ཚུ་གི་ཡིག་སྣོད་ཞིབ་དཔྱད་འབད་གནང་།\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgstr ""
+"འཛོལ་བ: ཐག་རིང་གི་ས་ཁོངས་ %s འདི་མཐུད་ལམ་བཏོག་ནུག། %d སྐར་ཆ་ཚུ་ནང་སླར་མཐུད་འབད་འོང་།\n"
 
-#: ../lib/protocols.c:2514
-#: ../lib/protocols.c:3167
-#: ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
+#: lib/protocols.c:1634 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/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
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "འཛོལ་བ: ཐག་རིང་གི་ས་ཁོངས་  %s གི་མཐུད་ལམ་བཏོག་ནུག། 
སླར་རྩོལ་འདི་མང་ཐོ་ལུ་ལྷོད་ཚར་ཡི་...བཤོལ་བཞག་དོ།\n"
-
-#: ../lib/protocols.c:3072
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "འཛོལ་བ: ཐག་རིང་གི་ས་ཁོངས་ %s འདི་མཐུད་ལམ་བཏོག་ནུག། %d སྐར་ཆ་ཚུ་ནང་སླར་མཐུད་འབད་འོང་།\n"
-
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "པི་ཊི་ཝའི་ %s: %s ཨམ་འདི་ཁ་ཕྱེ་མི་བཏུབ།\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "སོ་ཀེཊི་ཟུང་ %s འདི་གསར་བསྐྲུན་འབད་མི་བཏུབ།\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "འཛོལ་བ: ཨེསི་ཨེསི་ཨེཆ་  %s འདི་ལག་ལེན་འཐབ་མི་བཏུབ།\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "གཞན་ལས་སྦྱོར་ %s འདི་ཁ་སྤེལ་མི་བཏུབ།\n"
 
-#: ../lib/rfc2068.c:30
-#: ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "པོརོག་སི་ཧོསཊི་མིང:"
 
-#: ../lib/rfc2068.c:32
-#: ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ཕ་ཡེར་ཝཱལ་ཧོསཊི་མིང་།"
 
-#: ../lib/rfc2068.c:33
-#: ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "པོརོག་སི་འདྲེན་ལམ:"
 
-#: ../lib/rfc2068.c:35
-#: ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ཕ་ཡེར་ཝཱལ་འདི་གུ་ལུ་མཐུད་ནི་གི་འདྲེན་ལམ།"
 
-#: ../lib/rfc2068.c:36
-#: ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "པོརོག་སི་ལག་ལེན་པའི་མིང:"
 
-#: ../lib/rfc2068.c:38
-#: ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ཁྱོད་ཀྱི་ཕ་ཡེར་ཝཱལ་ལག་ལེན་པའི་མིང་།"
 
-#: ../lib/rfc2068.c:39
-#: ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "པོརོག་སི་ཆོག་ཡིག:"
 
-#: ../lib/rfc2068.c:41
-#: ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ཁྱོད་ཀྱི་ཕ་ཡེར་ཝཱལ་ཆོག་ཡིག།"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "ཨེཆ་ཊིཊི་པི་/ ༡.༡ ལག་ལེན་འཐབ།"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "ཁྱོད་ ཨེཆ་ཊི་ཊི་པི་/ ༡.༡ ཡང་ན་ ཨེཆ་ཊི་ཊི་པི་/ ༡.༠ ལག་ལེན་འཐབ་ནི་ཨིན་ན།"
 
-#: ../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"
@@ -949,442 +907,530 @@ 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"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "ས་ཁོངས་ཀྱི་བརྡ་བཀོད།"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "བདེན་བཤད་འབད་ནི།"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "ཨེཆ་ཊི་ཊི་པི་ པོརོག་སི་"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "སྲོལ་སྒྲིག།"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "གློག་འཕྲིན་ཁ་བྱང:"
 
-#: ../lib/rfc959.c:45
-msgid "This is the password that will be used whenever you log into a remote FTP server as anonymous"
-msgstr 
"འ་ནི་ཆོག་ཡིག་འདི་ནམ་རང་འབད་རུང་ཁྱོད་ཀྱིས་མིང་མེདཔ་སྦེ་ཐག་རིང་གི་ཨེཕ་ཊི་པི་སར་བར་ནང་ལུ་ནང་བསྐྱོད་འབདཝ་ད་ལག་ལེན་འཐབ་ནི་ཨིན།"
+#: lib/rfc959.c:45
+msgid ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
+msgstr ""
+"འ་ནི་ཆོག་ཡིག་འདི་ནམ་རང་འབད་རུང་ཁྱོད་ཀྱིས་མིང་མེདཔ་སྦེ་ཐག་རིང་གི་ཨེཕ་ཊི་པི་སར་བར་ནང་ལུ་ནང་བསྐྱོད་"
+"འབདཝ་ད་ལག་ལེན་འཐབ་ནི་ཨིན།"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "པོརོག་སི་རྩིས་ཐོ:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ཁྱོད་ཀྱི་ཕ་ཡེར་ཝཱལ་རྩིས་ཐོ་གི་ (གདམ་ཁ་ཅན)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "པོརོག་སི་སར་བར་གྱི་དབྱེ་བ:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
-msgid "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement 
string prefixed by a % that will be replaced with the proper data. The first character can be either p for 
proxy or h for the 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 
"ཁྱོད་ཀྱི་པོརོག་སི་སར་བར་འདི་གིས་ནང་བསྐྱོད་འབད་ནི་ལུ་ང་བཅས་ལས་ག་དེ་སྦེ་རེ་བ་བསྐྱེདཔ་ཨིན་ན་འ་ནི་འདི་གིས་གསལ་བཀོད་འབདཝ་ཨིན།
 ཚུལ་ལྡན་གནད་སྡུད་མཉམ་ཚབ་བཙུགས་འབད་ནི་ཨིན་མི་ % 
དེ་གིས་སྔ་གོང་ལས་གཏན་བཟོ་འབད་ཡོད་མི་ཡིག་འབྲུ་གཉིས་ཀྱི་ཚབ་མ་ཡིག་རྒྱུན་འདི་ཁྱོད་ཀྱིས་གསལ་བཀོད་འབད་ཚུགས། 
ཡིག་འབྲུ་དང་པམ་འདི་ཡང་ཅིན་པོརོག་སི་གི་དོན་ལུ་པི་འོང་ནི་དང་ ཡང
 ་ན་ ཨེཕ་ཊི་པི་སར་བར་འདི་གི་ཧོསཊི་གི་དོན་ལུ་ཨེཆ་འོང་ནི་ཨིན། ཡིག་འབྲུ་གཉིས་པམ་འདི་ ཡུ་ (ལག་ལེན་པ་), པི 
(རྩིས་སྤྲོད་), ཨེཆ་ (ཧོསཊི་) ,ཨོ་ (འདྲེན་ལམ་),ཡང་ན་ཨེ་(རྩིས་ཐོ་)འོང་ནི་ཨིན། དཔེར་བརྗོད་བཀོད་པ་ཅིན་ 
པོརོག་སི་ལག་ལེན་པ་འདི་གསལ་བཀོད་འབད་ནི་ལུ་ ཁྱོད་ཀྱ ས་ %pu ནང་ཡིག་དཔར་རྐྱབས་ཚུགས།"
-
-#: ../lib/rfc959.c:69
+msgid ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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 ""
+"ཁྱོད་ཀྱི་པོརོག་སི་སར་བར་འདི་གིས་ནང་བསྐྱོད་འབད་ནི་ལུ་ང་བཅས་ལས་ག་དེ་སྦེ་རེ་བ་བསྐྱེདཔ་ཨིན་ན་འ་ནི་འདི་གིས་"
+"གསལ་བཀོད་འབདཝ་ཨིན། ཚུལ་ལྡན་གནད་སྡུད་མཉམ་ཚབ་བཙུགས་འབད་ནི་ཨིན་མི་ % དེ་གིས་སྔ་གོང་ལས་གཏན་བཟོ་"
+"འབད་ཡོད་མི་ཡིག་འབྲུ་གཉིས་ཀྱི་ཚབ་མ་ཡིག་རྒྱུན་འདི་ཁྱོད་ཀྱིས་གསལ་བཀོད་འབད་ཚུགས། ཡིག་འབྲུ་དང་པམ་འདི་ཡང་"
+"ཅིན་པོརོག་སི་གི་དོན་ལུ་པི་འོང་ནི་དང་ ཡང་ན་ ཨེཕ་ཊི་པི་སར་བར་འདི་གི་ཧོསཊི་གི་དོན་ལུ་ཨེཆ་འོང་ནི་ཨིན། ཡིག་"
+"འབྲུ་གཉིས་པམ་འདི་ ཡུ་ (ལག་ལེན་པ་), པི (རྩིས་སྤྲོད་), ཨེཆ་ (ཧོསཊི་) ,ཨོ་ (འདྲེན་ལམ་),ཡང་ན་ཨེ་(རྩིས་"
+"ཐོ་)འོང་ནི་ཨིན། དཔེར་བརྗོད་བཀོད་པ་ཅིན་ པོརོག་སི་ལག་ལེན་པ་འདི་གསལ་བཀོད་འབད་ནི་ལུ་ ཁྱོད་ཀྱ ས་ %pu "
+"ནང་ཡིག་དཔར་རྐྱབས་ཚུགས།"
+
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "པི་ཨེ་ཨེསི་ཝི་ ཁ་བྱང་འདི་སྣང་མེད་བཞག།"
 
-#: ../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 "འ་ནི་འདི་ལྕོགས་ཅན་ཨིན་པ་ཅིན་ དེ་ལས་ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ སར་བར་ཚུ་ པི་ཨེ་ཨེསི་ཝི་ ཨའི་པི་ 
ཁ་བྱང་གི་ས་སྒོ་འདི་སྣང་མེད་བཞག་ནི་དང་ཚབ་ལུ་ཧོསཊི་ཨའི་པི་ཁ་བྱང་འདི་ལག་ལེན་འཐབ་འོང་། 
འ་ནི་འདི་འཕྲལ་འཕྲལ་རང་རོ་ཊར་ཚུ་གིས་ པི་ཨེ་ཨེསི་ཝི་ 
ལན་གསལ་ནང་ཁོང་གི་ཕྱིའི་ཨའི་པི་ཁ་བྱང་ལས་ལྷག་འདི་ནང་འཁོད་ཨའི་པི་ཁ་བྱང་འདི་འབྱིན་ནིའི་དོན་ལུ་དགོཔ་ཨིན།"
+#: 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 ""
+"འ་ནི་འདི་ལྕོགས་ཅན་ཨིན་པ་ཅིན་ དེ་ལས་ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ སར་བར་ཚུ་ པི་ཨེ་ཨེསི་ཝི་ ཨའི་པི་ ཁ་བྱང་གི་"
+"ས་སྒོ་འདི་སྣང་མེད་བཞག་ནི་དང་ཚབ་ལུ་ཧོསཊི་ཨའི་པི་ཁ་བྱང་འདི་ལག་ལེན་འཐབ་འོང་། འ་ནི་འདི་འཕྲལ་འཕྲལ་རང་"
+"རོ་ཊར་ཚུ་གིས་ པི་ཨེ་ཨེསི་ཝི་ ལན་གསལ་ནང་ཁོང་གི་ཕྱིའི་ཨའི་པི་ཁ་བྱང་ལས་ལྷག་འདི་ནང་འཁོད་ཨའི་པི་ཁ་བྱང་"
+"འདི་འབྱིན་ནིའི་དོན་ལུ་དགོཔ་ཨིན།"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "བྱ་ཡུལ་གྱི་ཡིག་སྣོད་གནས་སོར་ཚུ།"
 
-#: ../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. Generally, it is a good idea to keep this enabled unless 
you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open 
up a port on the client side and the remote server will attempt to connect to it."
-msgstr "འ་ནི་འདི་ལྕོགས་ཅན་ཨིན་པ་ཅིན་ དེ་ལས་ཐག་རིང་གི་ 
ཨེཕ་ཊི་པི་སར་བར་འདི་གིས་གནད་སྡུད་མཐུད་ལམ་གྱི་དོན་ལུ་འདྲེན་ལམ་འདི་ཁ་ཕྱེ་འོང་། 
ཁྱོད་ཕ་ཡེར་ཝཱལ་གྱི་རྒྱབ་ཁར་ཡོད་པ་ཅིན་ ཁྱོད་ཀྱིས་འ་ནི་འདི་ཡོངས་ཁྱབ་སྦེ་ལྕོགས་ཅན་བཟོ་དགོ་ 
འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བའི་ ཨེཕ་ཊི་པི་ 
སར་བར་རྙིངམ་འདི་ལུ་མ་མཐུད་ཚུན་ཚོད་ཁྱོད་ཀྱིས་འ་ནི་འདི་ལྕོགས་ཅན་སྦེ་བཞག་ནི་ལུ་གནས་��
 �ྐབས་ལེགས་ཤོམ་ཨིན། འ་ནི་འདི་ལྕོགས་མིན་ཐལ་ཡོད་པ་ཅིན་ དེ་ལས་ ཇི་ཨེཕ་ཊི་པི་ 
འདི་གིས་ཞབས་ཏོག་སྤྱོད་མི་གི་ཕྱོགས་ལུ་འདྲེན་ལམ་ཁ་ཕྱེ་ནི་དང་ཐག་རིང་གི་སར་བར་འདི་གིས་འདི་ལུ་མཐུད་ནི་ལུ་དཔའ་བཅམ་འོང་།"
-
-#: ../lib/rfc959.c:79
+#: 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. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
+msgstr ""
+"འ་ནི་འདི་ལྕོགས་ཅན་ཨིན་པ་ཅིན་ དེ་ལས་ཐག་རིང་གི་ ཨེཕ་ཊི་པི་སར་བར་འདི་གིས་གནད་སྡུད་མཐུད་ལམ་གྱི་དོན་ལུ་"
+"འདྲེན་ལམ་འདི་ཁ་ཕྱེ་འོང་། ཁྱོད་ཕ་ཡེར་ཝཱལ་གྱི་རྒྱབ་ཁར་ཡོད་པ་ཅིན་ ཁྱོད་ཀྱིས་འ་ནི་འདི་ཡོངས་ཁྱབ་སྦེ་ལྕོགས་ཅན་"
+"བཟོ་དགོ་ འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བའི་ ཨེཕ་ཊི་པི་ སར་བར་རྙིངམ་འདི་ལུ་མ་མཐུད་ཚུན་ཚོད་ཁྱོད་ཀྱིས་འ་ནི་འདི་"
+"ལྕོགས་ཅན་སྦེ་བཞག་ནི་ལུ་གནས་སྐབས་ལེགས་ཤོམ་ཨིན། འ་ནི་འདི་ལྕོགས་མིན་ཐལ་ཡོད་པ་ཅིན་ དེ་ལས་ ཇི་ཨེཕ་ཊི་"
+"པི་ འདི་གིས་ཞབས་ཏོག་སྤྱོད་མི་གི་ཕྱོགས་ལུ་འདྲེན་ལམ་ཁ་ཕྱེ་ནི་དང་ཐག་རིང་གི་སར་བར་འདི་གིས་འདི་ལུ་མཐུད་ནི་"
+"ལུ་དཔའ་བཅམ་འོང་།"
+
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "ཐག་རིང་གི་བརྡ་མཚོན་འབྲེལ་ལམ་ (LIST -L) ཚུ་མོས་མཐུན་བཟོ།"
 
-#: ../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 will want to disable this is if the remote FTP server doesn't 
support the -L option to LIST"
-msgstr "ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ 
སར་བར་འདི་གིས་ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་འདི་ནང་གི་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་མོས་མཐུན་འབད་ནི་ལུ་དཔའ་བཅམ་འོང་། 
ཡོངས་ཁྱབ་ལུ་ འ་ནི་འདི་ལྕོགས་ཅན་འབད་བཞག་ནི་ལུ་གནས་སྐབས་ལེགས་ཤོམ་ཨིན། 
ཁྱོད་ཀྱིས་འ་ནི་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་དགོ་པའི་ཆུ་ཚོད་འདི་ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ སར་བར་འདི་གིས་ -ཨེལ་ 
གདམ་ཁ་འདི་ཐོ་ཡིག་ལུ་རྒྱབ་སྐྱོར་མ་འབདཝ་ད��
 �ཨིན།"
+#: 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 "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
+msgstr ""
+"ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ སར་བར་འདི་གིས་ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་འདི་ནང་གི་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་མོས་"
+"མཐུན་འབད་ནི་ལུ་དཔའ་བཅམ་འོང་། ཡོངས་ཁྱབ་ལུ་ འ་ནི་འདི་ལྕོགས་ཅན་འབད་བཞག་ནི་ལུ་གནས་སྐབས་ལེགས་ཤོམ་"
+"ཨིན། ཁྱོད་ཀྱིས་འ་ནི་འདི་ལྕོགས་མིན་བཟོ་ནི་ལུ་དགོ་པའི་ཆུ་ཚོད་འདི་ཐག་རིང་གི་ ཨེཕ་ཊི་པི་ སར་བར་འདི་གིས་ -"
+"ཨེལ་ གདམ་ཁ་འདི་ཐོ་ཡིག་ལུ་རྒྱབ་སྐྱོར་མ་འབདཝ་ད་ཨིན།"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ཨེ་ཨེསི་སི་ཨའི་ཨའི་ ཐབས་ལམ་ནང་ལུ་ཡིག་སྣོད་ཚུ་གནས་སོར་འབད།"
 
-#: ../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 text files. If you are transfering from UNIX to UNIX, 
then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
-msgstr "ཁྱོད་ཀྱིས་ ཚིག་ཡིག་ཡིག་སྣོད་འདི་ཝིན་ཌོསི་ནང་ལས་ལུགས་ལྡོག་ལུ་དང་ ཡང་ཅིན་ 
ཡུ་ནིགསི་སྒྲོམ་ལུ་གནས་སོར་འབད་བ་ཅིན་ དེ་ལས་ཁྱོད་ཀྱིས་འ་ནི་འདི་ལྕོགས་ཅན་བཟོ་དགོ། 
རིམ་ལུགས་རེ་རེ་གིས་ཚིག་ཡིག་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་གྲལ་ཐིག་གསརཔ་སོ་སོ་སྦེ་ཁྱད་ཚབ་འབདཝ་ཨིན། 
ཁྱོད་ཀྱིས་ཡུ་ནིགསི་ལས་ཡུ་ནིགསི་ལུ་གནས་སོར་འབདཝ་ཨིན་པ་ཅིན་ཁྱོད་ཀྱིས་འ་ནི་འིད་ལྕོགས་མིན་བཟོ་
 དགོ།"
+#: lib/rfc959.c:87
+#, fuzzy
+msgid ""
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
+"then you should enable this. Each system represents newlines differently for "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
+msgstr ""
+"ཁྱོད་ཀྱིས་ ཚིག་ཡིག་ཡིག་སྣོད་འདི་ཝིན་ཌོསི་ནང་ལས་ལུགས་ལྡོག་ལུ་དང་ ཡང་ཅིན་ ཡུ་ནིགསི་སྒྲོམ་ལུ་གནས་སོར་འབད་"
+"བ་ཅིན་ དེ་ལས་ཁྱོད་ཀྱིས་འ་ནི་འདི་ལྕོགས་ཅན་བཟོ་དགོ། རིམ་ལུགས་རེ་རེ་གིས་ཚིག་ཡིག་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་གྲལ་"
+"ཐིག་གསརཔ་སོ་སོ་སྦེ་ཁྱད་ཚབ་འབདཝ་ཨིན། ཁྱོད་ཀྱིས་ཡུ་ནིགསི་ལས་ཡུ་ནིགསི་ལུ་གནས་སོར་འབདཝ་ཨིན་པ་ཅིན་ཁྱོད་"
+"ཀྱིས་འ་ནི་འིད་ལྕོགས་མིན་བཟོ་དགོ།"
 
-#: ../lib/rfc959.c:381
-#: ../lib/rfc959.c:390
-#: ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855
-#: ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "ལན་ནུས་མེད་ '%c' སར་བར་ལས་འཐོབ་ནུག།\n"
 
-#: ../lib/rfc959.c:745
-#: ../lib/rfc959.c:755
+#: 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 "པི་ཨེ་ཨེསི་ཝི་ ལན་  '%s'ནང་ལུ་ཨའི་པི་ཁ་བྱང་འཚོལ་མ་ཐོབ།'\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 "པི་ཨེ་ཨེསི་ཝི་ ལན་ནང་ལུ་ཨའི་པི་ཁ་བྱང་སྣང་མེད་བཞག་དོ་ %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"
 
-#: ../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
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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/sshv2.c:28
+#: 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 "ཨེསི་ཨེསི་ཨེཆ།"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "ཨེསི་ཨེསི་ཨེཆ་ ལས་རིམ་གྱི་མིང་:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "ཨེསི་ཨོསི་ཨེཆ་ ལག་ལེན་འཐབ་བཏུབ་མི་འདི་གི་འགྲུལ་ལམ།"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "ཨེསི་ཨེསི་ཨེཆ་ ཐེབས་ཚད་བཟུང་ཚུ:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "ཨེསི་ཨེསི་ཨེཆ་ ལས་རིམ་འདི་ལུ་རྩིས་སྤྲོད་ནི་གི་ཐེབས་ཚད་བཟུང་ཚུ།"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "ཨེསི་ཨོསི་ཨེཆ་ ལག་ལེན་པ/རྩིས་སྤྲོད་ དགོ།"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "ཨེསི་ཨེསི་ཨེཆ་ མཐུད་ལམ་ཚུ་གི་དོན་ལུ་ལག་ལེན་པའི་མིང་/ཆོག་ཡིག་དགོས་མཁོ་ཡོད།"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "ལས་རིམ་ %s འདི་གཡོག་བཀོལ་དོ།\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "ཨར་ཨེསི་ཨེ་ ལྡེ་མིག་བུ་གི་དོན་ལུ་ཆོག་ཚིག་བཙུགས།"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "ལྡེ་མིག་བུ་གི་དོན་ལུ་ཆོག་ཚིག་བཙུགས།"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "ཆོག་ཚིག།"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "ཆོག་ཚིག།"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ཨིན་/མེན)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ཆོག་ཡིག་བཙུགས།"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "མཐའ་བཙན་ཨའི་ཌི་ཆོག་ཡིག་བཙུགས:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "འཛོལ་བ: བདེན་མེད་ཀྱི་ཆོག་ཡིག་བཙུགས་ནུག།\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: གནད་སྤེལ་ལམ་ལུགས་འགོ་འབྱེད།\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: གནད་སྤེལ་ལམ་ལུགས་ཀྱི་ཐོན་རིམ་ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: ཁ་ཕྱེ་ %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: བསྡམས་\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: སྣོད་ཐོ་ཁ་ཕྱེ་ %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: སྣོད་ཐོ་ལྷ\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d:ཡིག་སྣོད་རྩ་བསྐྲད་གཏང་ %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: སྣོད་ཐོ་བཟོ་ %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: སྣོད་ཐོ་རྩ་བསྐྲོད་གཏང་ %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: འགྲུལ་ལམ་ངོ་མ་ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ཡིག་སྣོད་ཀྱི་ཁྱད་ཆོས་ཚུ་\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690
-#: ../src/gtk/bookmarks.c:1042
-#: ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253
-#: ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995
-#: ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "བཏུབ།"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "ཨི་ཨོ་ཨེཕ།"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "འདི་བཟུམ་མའི་ཡིག་སྣོད་ ཡང་ན་ སྣོད་ཐོ་མིན་འདུག།"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "གནང་བ་ཉན་མ་བཏུབ།"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "འཐུས་ཤོར།"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "འཕྲིན་དོན་བྱང་ཉེས།"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "མཐུད་ལམ་མིན་འདུག།"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག།"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "བཀོལ་སྤྱོད་ལུ་རྒྱབ་སྐྱོར་མིན་འདུག།"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "སར་བར་ལས་མ་ཤེས་པའི་འཕྲིན་དོན་སླར་ལོག་འབད་ནུག།"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 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"
 
-#: ../lib/sshv2.c:817
-msgid "There was an error initializing a SSH connection with the remote server. The error message from the 
remote server follows:\n"
-msgstr "ཐག་རིང་གི་སར་བར་མཉམ་ ཨེསི་ཨེསི་ཨེཆ་ མཐུད་ལམ་འགོ་འབྱེད་འབདཝ་ད་འཛོལ་བ་འདུག། 
ཐག་རིང་གི་སར་བར་འདི་ལས་འཛོལ་བའི་འཕྲིན་དོན་རྗེས་སུ་འབྲང་དོ།\n"
+#: lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
+msgstr ""
+"ཐག་རིང་གི་སར་བར་མཉམ་ ཨེསི་ཨེསི་ཨེཆ་ མཐུད་ལམ་འགོ་འབྱེད་འབདཝ་ད་འཛོལ་བ་འདུག། ཐག་རིང་གི་སར་བར་"
+"འདི་ལས་འཛོལ་བའི་འཕྲིན་དོན་རྗེས་སུ་འབྲང་དོ།\n"
 
-#: ../lib/sshv2.c:1134
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s འདི་ལུ་ ཨེསི་ཨེསི་ཨེཆ་ མཐུད་ལམ་ཁ་ཕྱེ་དོ།\n"
 
-#: ../lib/sshv2.c:1186
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "ཨེསི་ཨེསི་ཨེཆ་ སར་བར་ %s ནང་ལུ་མཐར་འཁྱོལཝ་སྦེ་ནང་བསྐྱོད་འབད་ཡོད།\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ མ་འཕྲུལ།"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ ཨིན་ཊོ་པི་ ཡིག་སྣོད:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ ཨིན་ཊོ་པི་ ཡིག་སྣོད།"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "ཨིན་ཊོ་པི་སོན་གྱི་རིང་ཚད:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ མ་འཕྲུལ་མཉམ་སོན་བཏབ་ནི་གི་བཱའིཊི་ཚུ་གི་མང་མཐའི་ཨང་།"
 
-#: ../lib/sslcommon.c:41
-#: ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ དོ་མཉམ་བདེན་སྦྱོར་འབད།"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1397,137 +1443,134 @@ msgstr ""
 " དོན་ཚན་= %s\n"
 " འཛོལ་བ་%i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 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 connected to (%s). 
Aborting connection.\n"
-msgstr "འཛོལ་བ: ཨེསི་ཨེསི་ཨེལ་ ལག་ཁྱེར་ (%s) ནང་གི་ཧོསཊི་འདི་ང་བཅས་ཀྱིས་ (%s) 
ལུ་མཐུད་ཡོད་པའི་ཧོསཊི་འདི་དང་མི་མཐུན་བས། མཐུད་ལམ་བར་བཤོལ་འབད་དོ།\n"
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
+msgstr ""
+"འཛོལ་བ: ཨེསི་ཨེསི་ཨེལ་ ལག་ཁྱེར་ (%s) ནང་གི་ཧོསཊི་འདི་ང་བཅས་ཀྱིས་ (%s) ལུ་མཐུད་ཡོད་པའི་ཧོསཊི་འདི་"
+"དང་མི་མཐུན་བས། མཐུད་ལམ་བར་བཤོལ་འབད་དོ།\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "ཁ་ཕྱེ་ ཨེསི་ཨེསི་ཨེལ་དཔེ་མཛོད་འདི་འགོ་འབྱེད་འབད་མི་བཏུབ།\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "སྔོན་སྒྲིག་ ཨེསི་ཨེསི་ཨེལ་ ལག་ཁྱེར་ཚུ་མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 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:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "འཛོལ་བ: ཨེསི་ཨེསི་ཨེལ་མ་འཕྲུལ་འདི་འགོ་འབྱེད་མ་འབད་བས།\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "ཨེསི་ཨེསི་ཨེལ་མཐུད་ལམ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ་(བི་ཨའི་ཨོ་ དངོས་པོ)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ མཐུད་ལམ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ་ (ཨེསི་ཨེསི་ཨེལ་ དངོས་པོ)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "དོ་མཉམ་ཡག་ཁྱེར་ %s མཉམ་འཛོལ་བ།\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "བཀོལ་སྤྱོད་ཆ་མེད་གཏང་ནུག།\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 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/ 
ནང་ལས་ཇི་ཨེཕ་ཊི་པི་གི་སྐོར་ལས་མཐའ་འཇུག་གི་གནས་ཚུལ་འདི་ཁྱོད་ཀྱིས་ཨ་རྟག་རང་འཚོལ་ཚུགས།\n"
-
-#: ../src/uicommon/gftpui.c:158
-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 "ཇི་ཨེཕ་ཊི་པི་འདི་ཡང་དག་སྦེ་ཉེན་ལེན་མེད་པར་འོངམ་ཨིན་ རྒྱས་བཤད་ཀྱི་དོན་ལུ་ 
འདྲ་བཤུས་འབད་ནིའི་ཡིག་སྣོད་འདི་བལྟ། 
འ་ནི་འདི་མཉེན་ཆས་དལཝ་ཨིནམ་དང་ཁྱོད་ཀྱིས་འདི་ལོག་བཀྲམ་སྤེལ་འབད་བཏུབ་དེ་འབདཝ་ད་འོག་གི་ལམ་ལུགས་དང་འཁྲིལ་དགོ་ 
རྒྱས་བཤད་ཀྱི་དོན་ལུ་ འདྲ་བཤུས་འབད་ནིའི་ཡིག་སྣོད་འདི་བལྟ།\n"
+#: 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 ""
+"ཇི་ཨེཕ་ཊི་པི་འདི་ཡང་དག་སྦེ་ཉེན་ལེན་མེད་པར་འོངམ་ཨིན་ རྒྱས་བཤད་ཀྱི་དོན་ལུ་ འདྲ་བཤུས་འབད་ནིའི་ཡིག་སྣོད་"
+"འདི་བལྟ། འ་ནི་འདི་མཉེན་ཆས་དལཝ་ཨིནམ་དང་ཁྱོད་ཀྱིས་འདི་ལོག་བཀྲམ་སྤེལ་འབད་བཏུབ་དེ་འབདཝ་ད་འོག་གི་ལམ་"
+"ལུགས་དང་འཁྲིལ་དགོ་ རྒྱས་བཤད་ཀྱི་དོན་ལུ་ འདྲ་བཤུས་འབད་ནིའི་ཡིག་སྣོད་འདི་བལྟ།\n"
 
-#: ../src/uicommon/gftpui.c:160
-#: ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "གིས་སྐད་བསྒྱུར་འབད་འབདཝ་ཨིན།"
 
-#: ../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 <ཐབས་ལམ་> <ཡིག་སྣོད་>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ལག་ལེན་: བསྐྱར་མིང་བཏགས་ <མིང་རྙིངམ་> <མིང་གསརཔ་>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ལག་ལེན་: བཏོན་གཏང་ <ཡིག་སྣོད་>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ལག་ལེན་: rmdir <སྣོད་ཐོ་>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ལག་ལེན་: ས་ཁོངས་ <ས་ཁོངས་བརྡ་བཀོད་>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ལག་ལེན་:  mkdir <སྣོད་ཐོ་གསརཔ་>\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 <སྣོད་ཐོ་>\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"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ལག་ལེན་: ཁ་ཕྱེ།"
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ལག་ལེན་: གཞི་སྒྲིག་  [འགྱུར་ཅན་ = གནས་གོང་]\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"
 
-#: ../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 འདི་ཇི་ཨེཕ་ཊི་པི་གི་ཚིག་ཡིག་འདྲེན་ལམ་ནང་ལུ་ཐོབ་ཚུགས་མིན་འདུག།\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1535,327 +1578,325 @@ msgstr ""
 "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་བསམ་བཀོད་ཚུ་:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ལག་ལེན་:%s <ཕ་ཡེལ་ཨིསི་པེཀ་>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "སྐོར་ལས།"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "ཇི་ཨེཕ་ཊི་པི་གི་བརྡ་དོན་སྟོནམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ཨིསི་ཀི།"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "(ཨེཕ་ཊི་པི་རྐྱངམ་གཅིག་གི་དོན་ལུ་) ཨིསི་ཀི་ལུ་ད་ལྟོའི་ཡིག་སྣོད་གནས་སོར་ཐབས་ལམ་འདི་གཞི་སྒྲིག་འབད།"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ཟུང་ལྡན།"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr "(ཨེཕ་ཊི་པི་གི་དོན་ལུ་རྐྱངམ་གཅིག་) ཟུང་ལྡན་ལུ་ད་ལྟོའི་ཡིག་སྣོད་གནས་སོར་ཐབས་ལམ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།"
+msgstr ""
+"(ཨེཕ་ཊི་པི་གི་དོན་ལུ་རྐྱངམ་གཅིག་) ཟུང་ལྡན་ལུ་ད་ལྟོའི་ཡིག་སྣོད་གནས་སོར་ཐབས་ལམ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "སི་ཌི།"
 
-#: ../src/uicommon/gftpui.c:944
-#: ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "ཐག་རིང་གི་ལཱ་འབད་ནིའི་སྣོད་ཐོ་འདི་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "ཐག་རིང་གི་ཡིག་སྣོད་ཀྱི་གནང་བ་ཚུ་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "བསལ།"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ཐོབ་ཚུགས་པའི་གདམ་ཁ་ཚུ་:འདྲ་མཛོད།"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "ཁ་བསྡམས།"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "ཐག་རིང་གི་ས་ཁོངས་ལས་མཐུད་ལམ་བཏོགཔ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "བཏོན་གཏང་།"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "ཐག་རིང་གི་ཡིག་སྣོད་རྩ་བསྐྲད་གཏངམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "ད་ལྟོའི་ཐག་རིང་གི་སྣོད་ཐོའི་དོན་ལུ་ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་སྟོནམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "ལེན།"
 
-#: ../src/uicommon/gftpui.c:958
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "ཐག་རིང་གི་ཡིག་སྣོད་(ཚུ་)ཕབ་ལེན་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "གྲོགས་རམ།"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "གྲོགས་རམ་གསལ་གཞི་འ་ནི་འདི་སྟོནམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "ཉེ་གནས་ལཱ་འབད་ནིའི་སྣོད་ཐོ་འདི་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་ཀྱི་གནང་བ་ཚུ་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་རྩ་བསྐྲད་གཏངམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "ད་ལྟོའི་ཉེ་གནས་སྣོད་ཐོ་འདི་ལུ་ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་འདི་སྟོནམ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "ཉེ་གནས་སྣོད་ཐོ་གསར་བསྐྲུན་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "ད་ལྟོའི་ཉེ་གནས་སྣོད་ཐོ་འདི་སྟོན།"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་ལུ་བསྐྱར་མིང་བཏགས།"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ཉེ་གནས་སྣོད་ཐོ་རྩ་བསྐྲད་གཏང་།"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "ཐག་རིང་གི་སྣོད་ཐོ་གསར་བསྐྲུན་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "ཉེ་གནས་ཡིག་སྣོད་ཚུ་བཙུགས་སྐྱེལ་འབདཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "ཁ་ཕྱེ།"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "ཐག་རིང་གི་ས་ཁོངས་འདི་ལུ་མཐུད་ལམ་ཁ་ཕྱེཝ་ཨིན།"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "བཙུགས།"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "ད་ལྟོའི་ཐག་རིང་གི་སྣོད་ཐོ་འདི་སྟོན།"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "སྤང་།"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "ཇི་ཨེཕ་ཊི་པི་ནང་ལས་ཕྱིར་ཐོན་འབད།"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "བསྐྱར་མིང་བཏགས།"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "ཐག་རིང་གི་ཡིག་སྣོད་ལུ་བསྐྱར་མིང་བཏགས།"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ཐག་རིང་གི་སྣོད་ཐོ་རྩ་བསྐྲད་གཏང་།"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "གཞི་སྒྲིག"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་འགྱུར་ཅན་ཚུ་སྟོན། ཁྱོད་ཀྱིས་ཡང་གཞི་སྒྲིག་ var=val 
གིས་འགྱུར་ཅན་ཚུ་གཞི་སྒྲིག་འབད་ཚུགས།"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"རིམ་སྒྲིག་ཡིག་སྣོད་འགྱུར་ཅན་ཚུ་སྟོན། ཁྱོད་ཀྱིས་ཡང་གཞི་སྒྲིག་ var=val གིས་འགྱུར་ཅན་ཚུ་གཞི་སྒྲིག་འབད་ཚུགས།"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "ས་ཁོངས།"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "ས་ཁོངས་ཀྱི་དམིགས་བསལ་བརྡ་བཀོད་འདི་གཡོག་བཀོལ།"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 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 log for which items were 
not properly transferred."
-msgstr "ཡིག་སྣོད་ཚུ་ཡང་ན་སྣོད་ཐོ་ཚུ་ %d གནས་སོར་འབད་མ་ཚུགས་པར་ཡོདཔ།  
རྣམ་གྲངས་ཚུ་གི་དོན་ལུ་ཚུལ་ལྡན་སྦེ་གནས་སོར་མ་འབད་བར་ཡོད་མི་དྲེན་དེབ་འདི་ཞིབ་དཔྱད་འབད།"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+"ཡིག་སྣོད་ཚུ་ཡང་ན་སྣོད་ཐོ་ཚུ་ %d གནས་སོར་འབད་མ་ཚུགས་པར་ཡོདཔ།  རྣམ་གྲངས་ཚུ་གི་དོན་ལུ་ཚུལ་ལྡན་སྦེ་"
+"གནས་སོར་མ་འབད་བར་ཡོད་མི་དྲེན་དེབ་འདི་ཞིབ་དཔྱད་འབད།"
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: གང་རུང་གཅིག་འབད་ནི་ལུ་དང་པ་རང་བཀག་ནིའི་ཨེབ་རྟ་འདི་ཨེབ་གནང་།\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "དེབ་རྟགས་གཡོག་བཀོལ།"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "དེབ་རྟགས་ཁ་སྐོང་རྐྱབས: དེབ་རྟགས་ཀྱི་དོན་ལུ་ཁྱོད་ཀྱིས་མིང་ངེས་པར་བཙུགས་དགོ།\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "དེབ་རྟགས་ཁ་སྐོང་རྐྱབས: དེབ་རྟགས་ %s 
ཁ་སྐོང་རྐྱབཧ་མི་བཏུབ་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མིང་དེ་ཧེ་མ་ལས་ཡོདཔ་ཨིན།\n"
+msgstr ""
+"དེབ་རྟགས་ཁ་སྐོང་རྐྱབས: དེབ་རྟགས་ %s ཁ་སྐོང་རྐྱབཧ་མི་བཏུབ་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མིང་དེ་ཧེ་མ་ལས་ཡོདཔ་"
+"ཨིན།\n"
 
-#: ../src/gtk/bookmarks.c:135
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "དེབ་རྟགས་ཁ་སྐོང་རྐྱབས།"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "དེབ་རྟགས་ཁ་སྐོང་རྐྱབས: ཁྱོད་ཀྱིས་ཧོསཊི་མིང་ངེས་པར་བཙུགས་དགོ།\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1865,31 +1906,31 @@ msgstr ""
 " ཡན་ལག་དཀར་ཆག་ནང་བཙུགས་ནི་ལུ་ཁྱོད་ཀྱིས་རྣམ་གྲངས་ཚུ་ / གིས་སོ་སོ་འཕྱེལ་ཚུགས།\n"
 "(ex: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "ཆོག་ཡིག་སེམས་ཁར་བཞག"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "ཁྱོད་ཀྱིས་དེབ་རྟགས་ཀྱི་དོན་ལུ་ མིང་ཅིག་གསལ་བཀོད་འབད་དགོཔ་ཨིན།"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "སྣོད་འཛིན་གསརཔ།"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "གསར་བསྐྲུན་འབད་ནི་ལུ་སྣོད་འཛིན་འདི་གི་མིང་བཙུགས།"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "རྣམ་གྲངས་གསརཔ།"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "གསར་བསྐྲུན་འབད་ནི་ལུ་རྣམ་གྲངས་གསརཔ་འདི་གི་མིང་བཙུགས།"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1898,113 +1939,99 @@ msgstr ""
 "ཁྱོད་ཀྱིས་ དེབ་རྟགས་དང་ དེའི་ཆ་ལག་ཚུ་ཀྲེག་གཏང་ནི་དེ་ \n"
 "%s ངེས་གཏན་ཨིན་ན?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "དེབ་རྟགས་བཏོན་གཏང་།"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "དེབ་རྟགས་ཚུ།"
 
-#: ../src/gtk/bookmarks.c:849
-#: ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "ཐོ་བཀོད་ཞུན་དག་འབད།"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "འགྲེལ་བཤད་:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ཧོསཊི་གི་མིང་:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "འདྲེན་ལམ:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "གནད་སྤེལ་ལམ་ལུགས:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "ཐག་རིང་གི་སྣོད་ཐོ:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ཉེ་གནས་སྣོད་ཐོ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ལག་ལེན་པའི་མིང་:"
 
-#: ../src/gtk/bookmarks.c:1000
-#: ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "ཆོག་ཡིག:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "རྩིས་ཐོ:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "མིང་མེདཔ་སྦེ་ནང་བསྐྱོད་འབད།"
 
-#: ../src/gtk/bookmarks.c:1053
-#: ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265
-#: ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216
-#: ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  ཆ་མེད་གཏང་  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ཡིག་སྣོད།(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ཡིག་སྣོད་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ཡིག་སྣོད་/སྣོད་འཛིན་_གསརཔ།..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ཡིག་སྣོད་/རྣམ་གྲངས་_གསརཔ།..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ཡིག་སྣོད་/_བཏོན་གཏང་།"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ཡིག་སྣོད་/_རྒྱུ་དངོས།..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ཡིག་སྣོད་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ཡིག་སྣོད་/_ཁ་བསྡམས།"
 
-#: ../src/gtk/bookmarks.c:1229
-#: ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "དེབ་རྟགས་ཚུ་ཞུན་དག་འབད།"
 
-#: ../src/gtk/chmod_dialog.c:132
-#: ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2012,101 +2039,90 @@ msgstr ""
 "ཁྱོད་ཀྱིས་ད་ལྟོ་ཁྱོད་རའི་ཡིག་སྣོད་ཚུ་གི་ཁྱོད་ཆོས་ཚུ་བདེ་སྒྲིག་འབད་ཚུགས་\n"
 " དྲན་འཛིན:  chmod ཁྱོད་རྣམ་འདི་ ftp སར་བར་ཚུ་ཆ་མཉམ་གྱིས་རྒྱབ་སྐྱོར་མི་འབད།"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "དམིགས་བསལ།"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "ཨེསི་ཡུ་ཨའི་ཌི།"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "ཨེསི་ཇི་ཨའི་ཌི།"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "རྩི་ཅན།"
 
-#: ../src/gtk/chmod_dialog.c:192
-#: ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ལག་ལེན་པ།"
 
-#: ../src/gtk/chmod_dialog.c:200
-#: ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "ལྷག"
 
-#: ../src/gtk/chmod_dialog.c:204
-#: ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "འབྲི།"
 
-#: ../src/gtk/chmod_dialog.c:208
-#: ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ལག་ལེན་འཐབ་ནི།"
 
-#: ../src/gtk/chmod_dialog.c:212
-#: ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "སྡེ་ཚན།"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "གཞན།"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "ཁྱོད་ཀྱིས་འ་ནི་ %ld ཡིག་སྣོད་ཚུ་དང་ %ld སྣོད་ཐོ་ཚུ་བཏོན་གཏང་ནི་ལུ་ངེས་ཏིག་ཨིན་ན།"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "ཁྱོད་ཀྱིས་འ་ནི་ %ld ཡིག་སྣོད་ཚུ་བཏོན་གཏང་ནི་ལུ་ངེས་ཏིག་ཨིན་ན།"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "ཁྱོད་ཀྱིས་འ་ནི་ %ld སྣོད་ཐོ་ཚུ་བཏོན་གཏང་ནི་ལུ་ངེས་ཏིག་ཨིན་ན།"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ཡིག་སྣོད་ཚུ་/སྣོད་ཐོ་ཚུ་བཏོན་གཏང་།"
 
-#: ../src/gtk/delete_dialog.c:90
-#: ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "བཏོན་གཏང་།"
 
-#: ../src/gtk/dnd.c:123
-#: ../src/gtk/gftp-gtk.c:1097
-#: ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "མཐུད།"
 
-#: ../src/gtk/dnd.c:136
-#: ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "ཡུ་ཨར་ཨེལ་ %s ཐོབ་ཅི།\n"
 
-#: ../src/gtk/dnd.c:159
-#: ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "འདྲུད་-དང་-བཀོག་བཞག"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ཕྱིར་ཐོན།"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2114,487 +2130,455 @@ msgstr ""
 "ཡར་འཕེལ་ནང་ལུ་ཡིག་སྣོད་གནས་སོར་ཚུ་ཡོད།\n"
 " ཁྱོད་ཀྱིས་ཕྱིར་ཐོན་འབད་ནི་ལུ་ངེས་ཏིག་ཨིན་ན?"
 
-#: ../src/gtk/gftp-gtk.c:219
-#: ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "གནས་ཁོངས་ཁ་ཕྱེ།"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "ལུ་ མཐུད་ནིའི་དོན་ལུ་ཡུ་ཨར་ཨེལ་བཙུགས།"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/ཨེཕ་ཊི་པི་(_F)"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/_ཨེཕ་ཊི་པི་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/_ཨེཕ་ཊི་པི་/ཝིན་ཌོ _༡།"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/_ཨེཕ་ཊི་པི་/ཝིན་ཌོ་_ ༢།"
 
-#: ../src/gtk/gftp-gtk.c:271
-#: ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/_ཨེཕ་ཊི་པི་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/ཨེཕ་ཊི་པི་/_ཨེ་ཨེསི་སི་ཨའི་ཨའི།"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/ཨེཕ་ཊི་པི་/_ཟུང་ལྡན།"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/ཨེཕ་ཊི་པི་ /_གདའ་གདམ་ཚུ།..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/ཨེཕ་ཊི་པི་/སྤང་(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ཉེ་གནས་(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/ཉེ་གནས་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/ཉེ་གནས་/ _ཉེ་གནས་ཁ་ཕྱེ།..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/ཉེ་གནས་/མཐུད་ལམ་_བཏོག་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:286
-#: ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/ཉེ་གནས་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/ཉེ་གནས་/ཡིག་སྣོད་_གསལ་བཀོད་བསྒྱུར་བཅོས་འབད།..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/ཉེ་གནས་/_སེལ་འཐུ་གྲུབ་ཡོད་མི་སྟོན།"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/ཉེ་གནས་/ཆ་མཉམ་_སེལ་འཐུ་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/ཉེ་གནས་/ཡིག་སྣོད་ཚུ་ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/ཉེ་གནས་/སེལ་འཐུ་བཤོལ་ཆ་མཉམ།"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/ཉེ་གནས་/ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་སྲུང་བཞག་..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/ཉེ་གནས་/ས་ཁོངས་ཀྱི་བརྡ་བཀོད་གཏང་..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/ཉེ་གནས་/_སྣོད་ཐོ་བསྒྱུར་བཅོས་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/ཉེ་གནས་/_གནང་བ་ཚུ།..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ཉེ་གནས་/_སྣོད་འཛིན་གསརཔ།..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/ཉེ་གནས་/བསྐྱར་མིང་_བཏགས།..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/ཉེ་གནས་/_བཏོན་གཏང་།..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/ཉེ་གནས་/_ཞུན་དག་འབད།..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/ཉེ་གནས་/_མཐོང་སྣང་།..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/ཉེ་གནས་/_ཡང་སེལ་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/ཐག་རིང་གི(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/ཐག་རིང་གི་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/ཐག་རིང་གི་/_གནས་ཁོངས་ཁ་ཕྱེ།..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/ཐག་རིང་གི་/_མཐུད་ལམ་བཏོག་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:314
-#: ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/ཐག་རིང་གི་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/ཐག་རིང་གི་/ཡིག་སྣོད་གསལ་བཀོད་_བསྒྱུར་བཅོས་འབད།..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/ཐག་རིང་གི་/_སེལ་འཐུ་གྲུབ་ཡོད་མི་སྟོན།"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/ཐག་རིང་གི་/ཆ་མཉམ་སེལ་འཐུ་_འབད།"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/ཐག་རིང་གི་/ཡིག་སྣོད་ཚུ་ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/ཐག་རིང་གི་/ཆ་མཉམ་སེལ་འཐུ་བཤོལ།"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/ཐག་རིང་གི་/ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་སྲུང་བཞག་འབད་..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/ཐག་རིང་གི་/ས་ཁོངས་ཀྱི་བརྡ་བཀོད་གཏང་..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/ཐག་རིང་གི་/_སྣོད་ཐོ་བསྒྱུར་བཅོས་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/ཐག་རིང་གི་/_གནང་བ་ཚུ།..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/ཐག་རིང་གི་/_སྣོད་འཛིན་གསརཔ།..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/ཐག་རིང་གི་/བསྐྱར་མིང་_བཏགས།..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/ཐག་རིང་གི་/_བཏོན་གཏང་།..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/ཐག་རིང་གི་/_ཞུན་དག་འབད།..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/ཐག་རིང་གི་/_མཐོང་སྣང་།..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/ཐག་རིང་གི་/_ཡང་སེལ་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/དེབ་རྟགས་ཚུ་(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/དེབ་རྟགས་ཚུ་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/དེབ་རྟགས་ཚུ་/དེབ་རྟགས་_ཁ་སྐོང་བརྐྱབ།"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/དེབ་རྟགས་ཚུ་/ དེབ་རྟགས་ཚུ་ཞུན་དག་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/དེབ་རྟགས་ཚུ་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_གནས་སོར།"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/གནས་སོར་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/གནས་སོར་/_འགོ་བཙུགས།"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/གནས་སོར་/བཀག_།"
 
-#: ../src/gtk/gftp-gtk.c:346
-#: ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/གནས་སོར་/ཨེསི་ཨི་པི།"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/གནས་སོར་/ད་ལྟོའི་ཡིག་སྣོད་_གོམ་འགྱོ།"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/གནས་སོར་/_ཡིག་སྣོད་རྩ་བསྐྲད་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/གནས་སོར་/ཡིག་སྣོད་ཡར་_སྤོ།"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/གནས་སོར་/ཡིག་སྣོད་མར་_སྤོ།"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/གནས་སོར་/ཡིག་སྣོད་ཚུ་_སླར་འདྲེན་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/གནས་སོར་/_ཡིག་སྣོད་ཚུ་བཙུགས།"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/དྲན་_དེབ།"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/དྲན་དེབ་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/དྲན་དེབ་/_བསལ།"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/དྲན་དེབ་/_མཐོང་སྣང་།"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/དྲན་དེབ་/_སྲུངས་བཞག་འབད།..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ལག་ཆས་ཚུ་(_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ལག་ཆས་ཚུ་/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/ལག་ཆས་ཚུ་/ཝིན་ཌོསི་_ག་བསྡུར་འབད།"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/ལག་ཆས་ཚུ་/_འདྲ་མཛོད་བསལ།"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/གྲོགས་རམ།"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/གྲོགས་རམ/འཕྲལ་གཏང་།"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/གྲོགས་རམ་/_སྐོར་ལས།"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "ཧོསཊི་:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "ཧོསཊི་:(_H)"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "འདྲེན་ལམ་:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ལག་ལེན་པ་:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ལག་ལེན་པ་:(_U)"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "རྩིས་སྤྲོད་:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "བརྡ་བཀོད་:"
 
-#: ../src/gtk/gftp-gtk.c:778
-#: ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ཡིག་སྣོད་ཀྱི་མིང་།"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "ཚད།"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "ཚེས་གྲངས།"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "ཁྱད་ཆོས་ཚུ།"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ཡར་འཕེལ།"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "འཛོལ་བ་:ལུ་ མཐུད་ནི་ལུ་ཧོསཊི་ནང་ལུ་ཁྱོད་ཀྱིས་ངེས་པར་ཡིག་དཔར་རྐྱབས་དགོ།\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ཡང་སེལ་འབད།"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ལག་ལེན་པའི་མིང་བཙེགས།"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "ས་ཁོངས་འདི་གི་དོན་ལུ་ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་བཙུགས་གནང་།"
 
-#: ../src/gtk/gtkui.c:143
-#: ../src/gtk/transfer.c:586
-#: ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "ས་ཁོངས་འདི་གི་དོན་ལུ་ཁྱོད་ཀྱི་ཆོག་ཡིག་བཙུགསགནང་།"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "བཀོལ་སྤྱོད་ཆ་མེད་གཏང་ནུག་...ཁྱོད་ཀྱིས་ཡིག་རྒྱུན་ངེས་པར་བཙུགས་དགོ།\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "སྣོད་ཐོ་བཟོ།"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "གསར་བསྐྲུན་འབད་ནི་ལུ་སྣོད་ཐོ་གི་མིང་བཙུགས།"
 
-#: ../src/gtk/gtkui.c:370
-#: ../src/gtk/gtkui.c:382
-#: ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "བསྐྱར་མིང་།"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s ལུ་ཁྱོད་ཀྱིས་བསྐྱར་མིང་ག་ཅི་བཏགས་ནི?"
 
-#: ../src/gtk/gtkui.c:402
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "ས་ཁོངས།"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ས་ཁོངས་-དམིགས་བསལ་གྱི་བརྡ་བཀོད་བཙུགས།"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "ས་གོངས་མཉམ་པིརི་པེནཌི་"
 
-#: ../src/gtk/gtkui.c:449
-#: ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "ཚབ་སྲུང་འབད་ནི།"
 
-#: ../src/gtk/gtkui_transfer.c:143
-#: ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "བསྐྱར་ལོག"
 
-#: ../src/gtk/gtkui_transfer.c:150
-#: ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "གོམ་འགྱོ།"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "བྱ་བ།"
 
-#: ../src/gtk/gtkui_transfer.c:236
-#: ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "གནས་སོར་ཡིག་སྣོད་ཚུ།"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2602,74 +2586,74 @@ msgstr ""
 "འོག་གི་ཡིག་སྣོད་ཚུ་ཉེ་གནས་དང་ཐག་རིང་གི་གློག་རིག་གཉིས་ཆ་རང་ལུ་ཡོད།\n"
 " ཁྱོད་ཀྱིས་ག་ཅི་འབད་དགོ་མནོ་མི་འདི་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "འཛོལ་བ།"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ཡིག་སྣོད་གོམ་འགྱོ།"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "ཆ་མཉམ་སུལ་འཐུ་བཤོལ།"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "ཡིག་སྣོད་གསལ་བཀོད་བསྒྱུར་བཅོས་འབད་: 
བཀོལ་སྤྱོད་ཆ་མེད་གཏང་ནུག་...ཁྱོད་ཀྱིས་ཡིག་རྒྱུན་ངེས་པར་བཙུགས་དགོ།\n"
+msgstr ""
+"ཡིག་སྣོད་གསལ་བཀོད་བསྒྱུར་བཅོས་འབད་: བཀོལ་སྤྱོད་ཆ་མེད་གཏང་ནུག་...ཁྱོད་ཀྱིས་ཡིག་རྒྱུན་ངེས་པར་བཙུགས་"
+"དགོ།\n"
 
-#: ../src/gtk/menu-items.c:83
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "ཡིག་སྣོད་གསལ་བཀོད་བསྒྱུར་བཅོས་འབད།"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "འཛོལ་བ་:%s འབྲི་ནིའི་དོན་ལུ་ %s ཁ་ཕྱེ་མི་བཏུབ།\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ཐོ་བཀོད་འབད་ནིའི་སྣོད་ཐོ་སྲུང་བཞག་འབད།"
 
-#: ../src/gtk/menu-items.c:327
-#: ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "འཛོལ་བ་: %s: %s འབྲི་ནི་ལུ་འཛོལ་བ།\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s ལུ་དྲན་དེབ་ཡིག་སྣོད་འདི་མཐར་འཁྱོལཝ་སྦེ་བྲིས་ནུག\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "དྲན་དེབ་སྲུང་བཞག་འབད།"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
-msgid "Cannot find the license agreement file COPYING. Please make sure it is in either %s or in %s"
-msgstr "ཆོག་ཐམ་གན་འཛིན་ཡིག་སྣོད་འདྲ་བཤུས་འབད་ནི་འདི་འཚོལ་མི་ཐོབ། འ་ནི་འདི་ %s ནང་ལུ་ ཡང་ཅིན་ %s 
ནང་ལུ་ཡོདཔ་ངེས་ཏིག་བཟོ་གནང་།"
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
+msgstr ""
+"ཆོག་ཐམ་གན་འཛིན་ཡིག་སྣོད་འདྲ་བཤུས་འབད་ནི་འདི་འཚོལ་མི་ཐོབ། འ་ནི་འདི་ %s ནང་ལུ་ ཡང་ཅིན་ %s ནང་ལུ་"
+"ཡོདཔ་ངེས་ཏིག་བཟོ་གནང་།"
 
-#: ../src/gtk/menu-items.c:454
-#: ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "ཇི་ཨེཕ་ཊི་པི་གི་སྐོར་ལས།"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2681,99 +2665,80 @@ msgstr ""
 "གཞུང་འབྲེལ་ཁྱིམ་གྱི་ཤོག་ལེབ་: http://www.gftp.org/\n";
 "གིས་ལས་རྟགས་: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "སྐོར་ལས།"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ཆོག་ཐམ་གན་འཛིན།"
 
-#: ../src/gtk/menu-items.c:558
-#: ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  ཁ་བསྡམས་  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "ཝིན་ཌོ་ཚུ་ག་བསྡུར་འབད།"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "ཐག་རིང་གི་སར་བར་ནང་ལས་མཐུད་ལམ་བཏོགས་ནི།"
 
-#: ../src/gtk/misc-gtk.c:261
-msgid "Connect to the site specified in the host entry. If the host entry is blank, then a dialog is 
presented that will allow you to enter a URL."
-msgstr "ཧོསཊི་ཐོ་བཀོད་འདི་ནང་ལུ་གསལ་བཀོད་འབད་མི་ས་ཁོངས་འདི་ལུ་མཐུད། ཧོསཊི་ཐོ་བཀོད་འདི་སྟོངམ་ཨིན་པ་ཅིན་ 
ཌའི་ལོག་འདི་ཡོདཔ་ལས་དེ་གིས་ཁྱོད་ལུ་ཡུ་ཨར་ཨེལ་འདི་བཙུགས་བཅུག་འོང་།"
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+"ཧོསཊི་ཐོ་བཀོད་འདི་ནང་ལུ་གསལ་བཀོད་འབད་མི་ས་ཁོངས་འདི་ལུ་མཐུད། ཧོསཊི་ཐོ་བཀོད་འདི་སྟོངམ་ཨིན་པ་ཅིན་ ཌའི་"
+"ལོག་འདི་ཡོདཔ་ལས་དེ་གིས་ཁྱོད་ལུ་ཡུ་ཨར་ཨེལ་འདི་བཙུགས་བཅུག་འོང་།"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ཡིག་སྣོད་ཚུ་ཆ་མཉམ།"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (འདྲ་མཛོད་འབད་ཡོད་) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "མ་མཐུད་པས།"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s: %s ཁ་ཕྱེ་ནི་ལུ་འཛོལ་བ།\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ཐག་རིང་གི་ས་ཁོངས་འདི་ལུ་མ་མཐུད་པས།\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s:གནད་སྤེལ་ལམ་ལུགས་འདི་ལག་ལེན་འཐབ་འདི་འ་ནི་ཁྱད་རྣམ་འདི་ཐོབ་མི་ཚུགས།\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: ཁྱོད་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་རྣམ་གྲངས་གཅིག་རྐྱངམ་ཅིག་ངེས་པར་འོང་དགོ།\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: ཁྱོད་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་རྣམ་གྲངས་ཉུང་མཐའ་རང་གཅིག་ངེས་པར་འོང་དགོ།\n"
 
-#: ../src/gtk/misc-gtk.c:926
-#: ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "བསྒྱུར་བཅོས།"
 
-#: ../src/gtk/misc-gtk.c:998
-#: ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "ཁ་སྐོང་།"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ཆ་མེད་གཏང་།"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "ཨིན།"
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "མེན།"
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "སྣོད་ཐོ་ཐོ་བཀོད་འབད་མི་ཚུ་ཐོབ་དོ།"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "བཀག"
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2782,114 +2747,89 @@ msgstr ""
 "ཐོབ་ཅི་ %ld སྣོད་ཐོ་ཚུ་\n"
 "དང་ %ld ཡིག་སྣོད་ཚུ།"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP འཛོལ་བ་: ཡིག་སྣོད་ %s ནང་ %s ཡང་ན་ %s འདི་འཚོལ་མི་ཐོབ།\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ཧོསཊི་ཞུན་དག་འབད།"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "ཧོསཊི་ཁ་སྐོང་རྐྱབས།"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "ཡིག་དཔར་རྐྱབས་:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "ཡིག་དཔར་རྐྱབས་:(_T)"
 
-#: ../src/gtk/options_dialog.c:1014
-#: ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ཌོ་མེན།"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "ཡོངས་འབྲེལ་ཁ་བྱང་།"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "ཡོངས་འབྲེལ་ཁ་བྱང་:(_N)"
 
-#: ../src/gtk/options_dialog.c:1088
-#: ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "ནེཊི་མཱསིཀ།"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "ནེཊི་མཱསིཀ་:(_e)"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ཌོ་མེན་:(_D)"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "ནེཊི་མཱསིཀ།"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "ཉེ་གནས་ཀྱི་ཧོསཊི་ཚུ།"
 
-#: ../src/gtk/options_dialog.c:1288
-#: ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "ཞུན་དག"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "ཞུན་དག་(_E)"
-
-#: ../src/gtk/options_dialog.c:1367
-#: ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "གདམ་ཁ་ཚུ།"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "འཇུག་སྤྱོད་འབད།"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 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 "མཐུད་དོ་..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ཡིག་སྣོད་ཚུ་སླར་འདྲེན་འབད་: ཐག་རིང་གི་ས་ཁོངས་འདི་ལུ་མ་མཐུད།\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "འཛོལ་བ: ཆ་ལག་ %d སླར་ལོག་ཡོདཔ་ %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "ཆ་ལག་ %d མཐར་འཁྱོལཝ་སྦེ་སླར་ལོག་འབད་ནུག།\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "འཛོལ་བ: ཆ་ལག་ %d འདི་ཚུལ་ལྡན་སྦེ་རྩ་གྲོལ་མ་གཏང་བས།\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "འཛོལ་བ: ཡིག་སྣོད་  %s: %s གི་སྐོར་ལས་བརྡ་དོན་ཐོབ་མི་ཚུགས།\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ཡིག་སྣོད་ %s འདི་བསྒྱུར་བཅོས་མ་འབད་བས།\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2898,147 +2838,210 @@ msgstr ""
 "ཡིག་སྣོད་ %s འདི་བསྒྱུར་བཅོས་འབད་ཡོད།\n"
 " ཁྱོད་ཀྱིས་འདི་བཙུགས་སྐྱེལ་འབད་ནི་ཨིན་ན?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 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 at %.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 "%s ཐོབ་ནུག་ %s གི་ནང་ལས་%.2fKB/s, %02d:%02d:%02d est ཆུ་ཚོད་ལྷག་ལུས།"
 
-#: ../src/gtk/transfer.c:773
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s གནས་སོར་གཞི་བཙུགས་ཀྱི་ བཅུག་པའི་%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 est. ཆུ་ཚོད་ལྷག་ལུས། ( %ld གི་ཡིག་སྣོད་ %ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 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"
 
-#: ../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:34
+msgid "Edit"
+msgstr "ཞུན་དག"
+
+#: 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:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s མཉམ་ %s ཁ་ཕྱེ་དོ།\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ཡིག་སྣོད་ %s སྟོན་དོ།\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "མཐོང་སྣང་: ཡིག་སྣོད་  %s: %s འདི་ཁ་ཕྱེ་མི་བཏུབ།\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "ཚད་འཛིན་འབད་ནིའི་རྩ་གྲོལ་ %s འདི་ཁ་ཕྱེ་མི་བཏུབ།\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ལག་ལེན་པའི་མིང་ [མིང་མེདཔ་]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ཧེ་མ་ལས་ཡོདཔ། (%s་འབྱུང་ཁུངས་ཀྱི་ཚད་ %s འགྲོ་ཡུལ་གྱི་ཚད་):\n"
-" (o) ཚབ་སྲུང་ (r) བསྐྱར་ལོག་ (s) གོམ་འགྱོ་ (O) ཆ་མཉམ་ཚབ་སྲུང་འབད་ (R) ཆ་མཉམ་བསྐྱར་ལོག་འབད་ (S) 
ཆ་མཉམ་གོམ་འགྱོ་ (%c)"
+" (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/ ནང་ལས་ཇི་ཨེཕ་ཊི་པི་གི་སྐོར་ལས་མཐའ་འཇུག་གི་གནས་ཚུལ་འདི་ཁྱོད་ཀྱིས་ཨ་"
+#~ "རྟག་རང་འཚོལ་ཚུགས།\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  ཆ་མེད་གཏང་  "
+
+#~ msgid "Host: "
+#~ msgstr "ཧོསཊི་:"
+
+#~ msgid "User: "
+#~ msgstr "ལག་ལེན་པ་:"
+
+#~ msgid "  Close  "
+#~ msgstr "  ཁ་བསྡམས་  "
+
+#~ msgid "Add"
+#~ msgstr "ཁ་སྐོང་།"
+
+#~ msgid "Cancel"
+#~ msgstr "ཆ་མེད་གཏང་།"
+
+#~ msgid "  Yes  "
+#~ msgstr "ཨིན།"
+
+#~ msgid "  No  "
+#~ msgstr "མེན།"
+
+#~ msgid "Type:"
+#~ msgstr "ཡིག་དཔར་རྐྱབས་:"
+
+#~ msgid "Network Address"
+#~ msgstr "ཡོངས་འབྲེལ་ཁ་བྱང་།"
+
+#~ msgid "_Edit"
+#~ msgstr "ཞུན་དག་(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "འཇུག་སྤྱོད་འབད།"
 
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr "ད་ལྟོའི་ལོ་ཀེལ་ %s ནང་ལས་ UTF-8 ལུ་ '%s' ཡིག་རྒྱུན་གཞི་བསྒྱུར་འབད་ནི་ལུ་འཛོལ་བ།\n"
+
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr "UTF-8:%s ནང་ལས་ད་ལྟོའི་ལོ་ཀེལ་ལུ་ '%s' ཡིག་རྒྱུན་གཞི་བསྒྱུར་འབད་ནུ་ལུ་འཛོལ་བ།\n"
+
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr ""
 #~ "འཛོལ་བ: གནས་སོར་ཡིག་སྣོད་ལུ་འབད་རྩོལ་བསྐྱེད་པའི་ཤུལ་ལས་ཐག་རིང་ས་ཁོངས་ཀྱི་མཐུད་ལམ་འདི་བཏོགས་"
 #~ "ནུག།\n"
+
 #~ msgid "There was an error transfering the file %s"
 #~ msgstr "ཡིག་སྣོད་ %s འདི་གནས་སོར་འབད་ནི་ལུ་འཛོལ་བ་འདུག།"
+
 #~ msgid "Startup Directory:"
 #~ msgstr "སྣོད་ཐོ་འགོ་བཙུགས:"
+
 #~ msgid "The default directory gFTP will go to on startup"
 #~ msgstr "སྔོན་སྒྲིག་སྣོད་ཐོ་gFTP འདི་གིས་འགོ་བཙུགས་ནི་ལུ་འགྱོ་འོང་།"
+
 #~ msgid "Connect via URL"
 #~ msgstr "བརྒྱུད་དེ་ ཡུ་ཨར་ཨེལ་ མཐུད།"
+
 #~ msgid "OpenURL"
 #~ msgstr "ཡུ་ཨར་ཨེལ་ཁ་ཕྱེ།"
+
 #~ msgid "/FTP/_Options..."
 #~ msgstr "/ཨེཕ་ཊི་པི་/གདམ་ཁ་ཚུ་...(_O)"
+
 #~ msgid "/Local/Make Directory..."
 #~ msgstr "/ཉེ་གནས་/སྣོད་ཐོ་བཟོ་..."
+
 #~ msgid "/Remote/Make Directory..."
 #~ msgstr "/ཐག་རིང་གི་/སྣོད་ཐོ་བཟོ་..."
+
 #~ msgid "/Transfers/Start Transfer"
 #~ msgstr "/གནས་སོར་ཚུ་/གནས་སོར་འགོ་བཙུགས།"
+
 #~ msgid "/Transfers/Stop Transfer"
 #~ msgstr "/གནས་སོར་ཚུ་/གནས་སོར་བཀག་བཞག"
+
 #~ msgid "Stopping the transfer of %s\n"
 #~ msgstr "%s གི་གནས་སོར་འདི་བསྒུག་དོ།\n"
-
diff --git a/po/el.po b/po/el.po
index f0299a9..77c2463 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,51 +7,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-04 13:08+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-01-04 04:14+0200\n"
 "Last-Translator: Marios Zintilis <m zindilis dmajor org>\n"
 "Language-Team:  <team gnome gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Μη έγκυρο URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Σφάλμα: Μη έγκυρη γραμμή %s στο αρχείο καταλόγου cache\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -59,49 +59,49 @@ msgstr ""
 "Σφάλμα μετατροπής αλφαριθμητικού '%s' από κωδικοποίηση χαρακτήρων %s σε "
 "κωδικοποίηση χαρακτήρων %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία ανοίγματος τοπικού αρχείου:%s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Σφάλμα: Αδυναμία εγγραφής στο socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Σφάλμα: Αδυναμία ανάγνωσης από socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Προειδοποίηση: Αδυναμία εύρεσης κυρίως αρχείου σελιδοδεικτών %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Προειδοποίηση gFTP: Υπερπήδηση γραμμής %d στο αρχείο σελιδοδεικτών: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Προειδοποίηση gFTP: Η γραμμή %d δεν έχει αρκετές παραμέτρους\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -111,7 +111,7 @@ msgstr ""
 "χρειάζονται να βγούν έξω στο διαμεσολαβητή (αν είναι διαθέσιμος). Σύνταξη: "
 "dont_use_proxy=.domain ή dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -120,53 +120,53 @@ msgstr ""
 "προβολής. Σημείωση: Όλες οι παράμετροι εκτός της επέκτασης αρχείου είναι "
 "προαιρετικές"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Κάνατε make install;\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Σφάλμα gFTP: Εσφαλμένο όνομα αρχείου καταγραφής %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -175,7 +175,7 @@ msgstr ""
 "Masney <masneyb gftp org>. Προειδοποίηση: Όποια σχόλια γράψετε σε αυτό το "
 "αρχείο θα αντικατασταθούν."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -188,7 +188,7 @@ msgstr ""
 "επεξεργάζεστε αυτό το αρχείο. Πριν από αυτό όλοι οι κωδικοί ήταν σε απλό "
 "κείμενο."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -199,95 +199,94 @@ msgstr ""
 "αρχείο θα αντικατασταθούν. Αν μια εγγραφή έχει ένα (*) στο σχόλιο της, δε θα "
 "μπορείτε να την αλλάξετε μέσα από το gFTP "
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<άγνωστο>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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' δεν βρέθηκε στο global hash table\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Σφάλμα: Αδυναμία ανεβάσματος αρχείου %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία εγγραφής στο αρχείο %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Σφάλμα: Σφάλμα κλεισίματος αρχείου: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Κατεστραμμένη λίστα αρχείων από τον εξυπηρετητή FSP %s\n"
 
-#: ../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
+#: 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 "άγνωστο"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Αδυναμία λήψης λίστας καταλόγου FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Επιτυχής αλλαγή καταλόγου σε %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Αδυναμία αλλαγής καταλόγου σε %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Επιτυχής απομάκρυνση %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία απομάκρυνσης αρχείου %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -295,7 +294,7 @@ msgstr ""
 "Η υπόστήριξη FTPS δεν είναι διαθέσιμη μιας και δεν έχει γίνει compile in η "
 "υποστήριξη SSL. Έξοδος από τη σύνδεση.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -303,107 +302,105 @@ msgstr ""
 "Η υπόστήριξη HTTPS δεν είναι διαθέσιμη μιας και δεν έχει γίνει compile in η "
 "υποστήριξη SSL. Έξοδος από τη σύνδεση.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Αδυναμία λήψης τρέχοντος καταλόγου: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Επιτυχής αλλαγή τοπικού καταλόγου σε %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Αδυναμία αλλαγής τοπικού καταλόγου σε %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία truncate τοπικού αρχείου  %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Αδυναμία λήψης λίστας τοπικού καταλόγου %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Επιτυχής αλλαγή κατάστασης λειτουργίας του %s σε %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Σφάλμα: Αδυναμία αλλαγής κατάστασης λειτουργίας του %s σε %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Επιτυχής αλλαγή χρονικής σήμανσης του %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία αλλαγής χρονικής σήμανσης του %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "τοπικό σύστημα αρχείων"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "χρήση: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "κανένα"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "αρχείο"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "μέγεθος"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "χρήστης"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "ομάδα"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "ημερομηνία-ώρα"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "γνωρίσμ."
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "φθίνουσα"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "αύξουσα"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Γενικά"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Πρόγραμμα προβολής:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -411,27 +408,27 @@ msgstr ""
 "Το προεπιλεγμένο πρόγραμμα προβολής αρχείων. Αν αυτό είναι κενό θα "
 "χρησιμοποιηθεί το εσωτερικό πρόγραμμα προβολής αρχείων."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Πρόγραμμα επεξεργασίας:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Το προεπιλεγμένο πρόγραμμα για την επεξεργασία αρχείων."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Μέγιστο μέγεθος παραθύρου καταγραφής:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Το μέγιστο μέγεθος του παραθύρου καταγραφής σε  bytes για το GTK+ port"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Απομακρυσμένες κωδικοποιήσεις χαρακτήρων:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -439,11 +436,11 @@ msgstr ""
 "Αυτή είναι μια λίστα κωδικοποποιήσεων χαρακτήρων διαχωρισμένη με κόμματα, "
 "που προσπαθεί να μετατρέψει τα απομακρυσμένα μηνύματα στο τρέχον locale"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Απομακρυσμένη LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -451,198 +448,202 @@ msgstr ""
 "Αυτή είναι η τιμή της LC_TIME για την απομακρυσμένη σελίδα. Αυτό υπάρχει για "
 "να αναλύονται σωστά στις λίστες καταλόγου."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Ο αριθμός των δευτερολέπτων που διατηρούνται οι καταχωρήσεις στη λανθάνουσα "
 "μνήμη πριν να λήξουν."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Πρόσθεση μεταφορών αρχείων"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Πρόσθεση νέων μεταφορών αρχείων στα ήδη υπάρχοντα"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Να γίνεται μια μεταφορά τη φορά"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Να γίνεται μόνο μια μεταφορά τη φορά?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Αντικατάσταση ως προεπιλογή"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Αντικατάσταση αρχείων ως προεπιλογή ή ορισμός για τη συνέχιση μεταφοράς "
 "αρχείων"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Διατήρηση δικαιωμάτων αρχείων"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Διατήρηση δικαιωμάτων των αρχείων που μεταφέρονται"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Διατήρηση ώρας αρχείου"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Διατήρηση της ώρας αρχείου των αρχείων που μεταφέρονται"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Ανανέωση μετά από κάθε μεταφορά αρχείου"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Ανανέωση της λίστας μετά από κάθε μεταφορά αρχείου"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ταξινόμηση καταλόγων πρώτα"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Τοποθέτηση πρώτα των καταλόγων και μετά των αρχείων"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Εμφάνιση κρυφών αρχείων"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Εμφάνιση κρυφών αρχείων στις λίστες"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Εμφάνιση της κατάστασης μεταφοράς στον τίτλο"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Εμφάνιση της κατάστασης μεταφοράς στη μπάρα τίτλου"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Έναρξη μεταφοράς αρχείων"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Αυτόματη εκκίνηση της μεταφοράς αρχείων όταν βρίσκονται στην ουρά"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Να επιτρέπονται οι χειροκίνητες εντολές στο GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Να επιτρέπεται η χειροκίνητη εισαγωγή εντολών στο GUI (όπως η λειτουργία "
 "κειμένου)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Απομνημόνευση τελευταίου καταλόγου"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Αποθήκευση του τελευταίου τοπικού και απομακρυσμένου καταλόγου όταν κλείνει "
 "η εφαρμογή."
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Σύνδεση στον απομακρυσμένο εξυπηρετητή κατά την εκκίνηση"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Αυτόματη σύνδεση στον απομακρυσμένο εξυπηρετητή όταν εκκινείται η εφαρμογή."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Όριο χρόνου δικτύου:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Η αναμονή ορίου χρόνου για εισερχόμενα/εξερχόμενα δικτύου. Αυτό ΔΕΝ είναι "
 "όριο χρόνου αδράνειας."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Προσπάθειες επανασύνδεσης:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Ο αριθμός των αυτόματων προσπαθειών επανασύνδεσης. Ορισμός στο 0 για "
 "απεριόριστες προσπάθειες."
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Διάστημα μεταξύ προσπαθειών:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Ο αριθμός των δευτερολέπτων για αναμονή μεταξύ προσπαθειών"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Μέγιστα KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Τα μέγιστα KB/S:τα οποία μια μεταγορά αρχείου μπορεί να λάβει. (Ορισμός σε 0 "
 "για απενεργοποίηση)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Μέγεθος μπλοκ μεταφοράς:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Το μέγεθος μπλοκ που χρησιμοποιείται κατά τη μεταφορά αρχείων. Θα πρέπει να "
 "είναι πολλαπλάσιο του 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Προεπιλεγμένο πρωτόκολλο:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Αυτό καθορίζει το εξ ορισμού πρωτόκολλο που θα χρησιμοποιείται"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Ενεργοποίηση υποστήριξης IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -650,27 +651,27 @@ msgstr ""
 "Αυτό ορίζει τι θα συμβεί όταν κάνετε διπλό κλικ σε ένα αρχείο στη λίστα "
 "αρχείων. 0=Προβολή αρχείου 1=Επεξεργασία αρχείου 2=Μεταφορά αρχείου"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Το εξ ορισμού πλάτος της λίστας των τοπικών αρχείων"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Το εξ ορισμού πλάτος της λίστας των απομακρυσμένων αρχείων"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Το εξ ορισμού ύψος της λίστας των τοπικών/απομακρυσμένων αρχείων"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Το εξ ορισμού ύψος της λίστας των μεταφερόμενων αρχείων"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Το εξ ορισμού ύψος του παραθύρου καταγραφής"
 
-#: ../lib/options.h:177
+#: 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."
@@ -678,15 +679,15 @@ msgstr ""
 "Το πλάτος της στήλης των ονομάτων αρχείων στο παράθυρο μεταφοράς. Αν ορισθεί "
 "σε 0 αυτή η στήλη αλλάζει μέγεθος αυτόματα."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Η εξ ορισμού στήλη ταξινόμησης"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Αύξουσα ή φθίνουσα ταξινόμηση"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -695,7 +696,7 @@ msgstr ""
 "0 αυτή η στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται "
 "αυτή η στήλη "
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -704,7 +705,7 @@ msgstr ""
 "στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται αυτή η "
 "στήλη "
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -713,7 +714,7 @@ msgstr ""
 "στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται αυτή η "
 "στήλη "
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -722,7 +723,7 @@ msgstr ""
 "στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται αυτή η "
 "στήλη "
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -731,7 +732,7 @@ msgstr ""
 "στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται αυτή η "
 "στήλη "
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -740,75 +741,75 @@ msgstr ""
 "στήλη αλλάζει μέγεθος αυτόματα. Αν ορισθεί σε 1 απενεργοποιείται αυτή η "
 "στήλη "
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Το χρώμα των εντολών που θα στέλνονται στον εξυπηρετητή"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Το χρώμα των εντολών που θα λαμβάνονται από τον εξυπηρετητή"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Το χρώμα των μηνυμάτων σφάλματος"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Το χρώμα των υπολοίπων από τα μηνύματα καταγραφής"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Τοπικά"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Σελιδοδείκτης"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Η μεταφορά αρχείου θα περιοριστεί σε %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Σφάλμα ορισμού LC_TIME σε '%s'. Επιστροφή σε '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Φόρτωση λίστας καταλόγου %s  από την cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Φόρτωση λίστας καταλόγου %s  από διακομιστή (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -817,114 +818,114 @@ msgstr ""
 "Προειδοποίηση: Stripping path off of file '%s'. The stripped path (%s) "
 "doesn't match the current directory (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Σφάλμα: Αδυναμία εγγραφής στη λανθάνουσα μνήμη: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Σφάλμα: Αδυναμία εύρεσης σελιδοδείκτη %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Σφάλμα σελιδοδεικτών: Η καταχώρηση σελιδοδείκτη %s δεν έχει ένα όνομα "
 "συστήματος\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Το πρωτόκολλο '%s' δεν υποστηρίζεται προς το παρόν.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Βρέθηκε κυκλικός συμβολικός σύνδεσμος %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Σφάλμα: Η απομακρυσμένη σελίδα %s αποσυνδέθηκε. Το όριο επαναπροσπαθειών "
 "καλύφθηκε...παραίτηση\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 flag: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Αδυναμία ανοίγματος κυρίως pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Αδυναμία δημιουργίας ζεύγους υποδοχής: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Σφάλμα: Αδυναμία εκτέλεσης  ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Αποτυχία δικράνωσης άλλης διεργασίας: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Όνομα συστήματος διαμεσολαβητή:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Όνομα συστήματος Firewall"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Θύρα διαμεσολαβητή:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Θύρα για σύνδεση στον  firewall"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Όνομα χρήστη διαμεσολαβητή:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Το όνομα χρήστη του  firewall σας"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Κωδικός διαμεσολαβητή:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ο κωδικός του  firewall σας"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Χρήση HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -933,65 +934,65 @@ msgstr ""
 "Ελήφθη λανθασμένη απάντηση από τον εξυπηρετητή, αποσύνδεση\n"
 "Μή έγκυρο μέγεθος chunk '%s' η απόκριση από τον απομακρυσμένο εξυπηρετητή\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Εκκίνηση της μεταφοράς αρχείου σε offset"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Αδυναμία λήψης αρχείου %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Λήψη λίστας καταλόγου...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Ελήφθη λανθασμένη απάντηση από τον εξυπηρετητή, αποσύνδεση\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Εντολή SITE "
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:θύρα"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "ΠΙΣΤΟΠΟΙΗΣΗ"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Διαμσολαβητής HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -999,19 +1000,19 @@ msgstr ""
 "Αυτός είναι ένας κωδικός που θα χρησιμοποιείται κάθε φορά που θα συνδέεστε "
 "σε έναν απομακρυσμένο εξυπηρετητή FTP ως ανώνυμος"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Λογαριασμός διαμεσολαβητή:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Ο λογαριασμός στον firewall (προαιρετικό)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Είδος εξυπηρετητή διαμεσολάβησης:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1030,11 +1031,11 @@ msgstr ""
 "παράδειγμα για να καθορίσετε το χρήστη του διαμεσολαβητή μπορείτε να "
 "πληκτρολογήσετε %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Αγνόηση PASV address"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1046,11 +1047,11 @@ msgstr ""
 "συστήματος. Αυτό απαιτείται συχνά για rooterwπου δίνουν την εσωτερική τους "
 "αντί για την εξωτερική διεύθυνση IP σε μια απάντηση PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Παθητικές μεταφορές αρχείου"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1067,11 +1068,11 @@ msgstr ""
 "στη μεριά του πελάτη και ο απομακρυσμένος εξυπηρετητής θα προσπαθήσει να "
 "συνδεθεί σε αυτή."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Επίλυση απομακρυσμένων συμβολικών δεσμών (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1084,15 +1085,16 @@ msgstr ""
 "όταν ο απομακρυσμένος εξυπηρετητής FTP δεν θα υποστηρίζει την παράμετρο -L "
 "για LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Μεταφορά αρχείων σε λειτουργία ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1102,335 +1104,326 @@ msgstr ""
 "UNIX σε UNIX δεν υπάρχει πρόβλημα αν δεν είναι ενεργό. Αν μεταφέρετε δυαδικά "
 "δεδομένα, τότε θα θέλετε να το απενεργοποιήσετε."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Αποτυχία δημιουργίας μιας  IPv4 socket: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Δεν είναι δυνατή η εύρεση διεύθυνσης IP σε απάντηση PASV  '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Αγνόηση διεύθυνσης IP σε PASV response, σύνδεση με %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Αδυναμία δημιουργίας σύνδεσης δεδομένων : %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Αδυναμία πρόσδεσης μιας θύρας: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Αποτυχία δημιουργίας IPv6 socket: %s\n"
 
-#: ../lib/rfc959.c:895
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Μη έγκυρη απάντηση EPSV '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Αδυναμία λήψης διεύθυνσης της τοπικής υποδοχής: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Αδυναμία αποδοχής σύνδεσης από τον εξυπηρετητή: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "σύνολο"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Αδυναμία λήψης socket flags: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Αδυναμία ορισμού υποδοχής σε non-blocking: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Όνομα προγράμματος SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Η διαδρομή για το εκτελέσιμο SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Έξτρα παράμετροι SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Έξτρα παράμετροι για το πρόγραμμα SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Απαιτείται SSH Όνομα χρήστη/Κωδικός"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Απαιτείται Όνομα χρήστη/Κωδικός για συνδέσεις SSH "
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Εκτέλεση προγράμματος  %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Εισαγωγή passphrase για κλειδί RSA key"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Εισάγετε passphrase για κλειδί '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Κωδικός"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "κωδικός"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Εισάγετε PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό πρόσβασης"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Εισάγετε κωδικό SecurID: "
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Σφάλμα: Εισήχθηκε ένας άκυρος κωδικός\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Αρχικοποίηση πρωτοκόλλου\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Έκδοση πρωτοκόλλου %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d:Άνοιγμα %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Κλείσιμο\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Άνοιγμα καταλόγου %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Ανάγνωση καταλόγου\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Απομάκρυνση αρχείου %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Δημιουργία καταλόγου %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Απομάκρυνση καταλόγου %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Γνωρίσματα αρχείου\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Εντάξει"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Δεν υπάρχει τέτοιο αρχείο ή κατάλογος"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Αποτυχία"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Εσφαλμένο μήνυμα"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Όχι σύνδεση"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Η σύνδεση χάθηκε"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Η λειτουργία δεν υποστηρίζεται"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Επιστράφηκε άγνωστο μήνυμα από τον εξυπηρετητή"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Σφάλμα: Το μέγεθος του μηνύματος %d είναι πολύ μεγάλο\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1439,41 +1432,41 @@ msgstr ""
 "απομακρυσμένο εξυπηρετητή. Ακολουθεί το μήνυμα σφάλματος από τον "
 "απομακρυσμένο εξυπηρετητή:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Άνοιγμα σύνδεσης SSH σε %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Επιτυχής είσοδος στον εξυπηρετητή SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Μηχανή SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Αρχείο εντροπίας SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Αρχείο εντροπίας SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Διάρκεια σπόρου εντροπίας:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Ο μέγιστος αριθμός από bytes για τη μηχανή SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Επιβεβαίωση SSL Peer"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1486,11 +1479,11 @@ msgstr ""
 "Θέμα = %s\n"
 "Σφάλμα %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Αδυναμία λήψης πιστοποιητικού peer\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1499,45 +1492,45 @@ msgstr ""
 "ΣΦΑΛΜΑ: Το σύστημα στο πιστοποιητικό SSL (%s) δεν ταιριάζει με το σύστημα με "
 "το οποίο έγινε σύνδεση (%s). Διακοπή σύνδεσης.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Αποτυχία αρχικοποίησης της βιβλιοθήκης OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Σφάλμα φόρτωσης εξ ορισμού πιστοποιητικών SSL\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Σφάλμα ορισμού λίστα αποτυπωμάτων ( μή έγκυρα αποτυπώματα)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Σφάλμα: Η μηχανή SSL δεν αρχικοποιήθηκε\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Σφάλμα ορισμού σύνδεσης SSL (BIO object)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Σφάλμα ορισμού σύνδεσης SSL (SSL object)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Σφάλμα με peer certificate: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Η λειτουργία ακυρώθηκε\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Αναμονή %d  πριν την προσπάθεια επανασύνδεσης\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1547,74 +1540,74 @@ msgstr ""
 "δείτε το αρχείο COPYING. Αυτό είναι ένα ελευθερο λογισμικό, και είστε "
 "ευπρόσδεκτοι να το αναδιανείμετε, για λεπτομέρειες δείτε το αρχείο COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Μεταφράστηκε από"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "χρήση : chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "χρήση : μετονομασία <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "χρήση: διαγραφή  <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "χρήση: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "χρήση:site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "χρήση:  mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "χρήση :  chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Μη έγκυρη παράμετρος\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Εκκαθάριση της λανθάνουσας μνήμης καταλόγου\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "χρήση: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "χρήση:  set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Σφάλμα: Η μεταβλητή %s δεν είναι μια έγκυρη μεταβλητή ρύθμισης.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1622,287 +1615,287 @@ msgstr ""
 "Υποστηριζόμενες εντολές:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "χρήση : %s <φίλτρο για το όνομα αρχείου>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Προβάλλει πληροφορίες για το gFTP "
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Ορίζει την τρέχουσα λειτουργία μεταφοράς σε Ascii  (μόνο για FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Ορίζει την τρέχουσα λειτουργία μεταφοράς σε Δυαδική (μόνο για FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Αλλάζει τον απομακρυσμένο ενεργό κατάλογο"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Αλλάζει τα δικαιώματα σε ένα απομακρυσμένο αρχείο"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Διαθέσιμες επιλογές: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Αποσυνδέει από μια απομακρυσμένη σελίδα"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Αφαιρεί ένα απομακρυσμένο"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Εμφανίζει τη λίστα καταλόγου από τον τρέχοντα απομακρυσμένο κατάλογο"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Μεταφορτώνει απομακρυσμένα αρχεία"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Εμφανίζει την οθόνη βοήθειας"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Αλλάζει τον ενεργό τοπικό κατάλογο"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Αλλάζει τα δικαιώματα από ένα τοπικό αρχείο"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Αφαιρεί ένα τοπικό αρχείο"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Εμφανίζει τη λίστα καταλόγου από τον τρέχοντα τοπικό κατάλογο"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Δημιουργεί ένα τοπικό κατάλογο"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Προβολή τρέχοντος τοπικού καταλόγου"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "Irename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Μετονομασία ενός τοπικού αρχείου"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Αφαίρεση ενός τοπικού καταλόγου"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Δημιουργεί ένα απομακρυσμένο κατάλογο"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Ανεβάζει τοπικά αρχεία"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Ανοίγει μια σύνδεση στην απομακρυσμένη ιστοσελίδα"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Προβολή του τρέχοντος απομακρυσμένου καταλόγου"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Έξοδος από το gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Μετονομασία ενός απομακρυσμένου καταλόγου"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Αφαίρεση ενός απομακρυσμένου καταλόγου"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Εμφάνιση μεταβλητών ρύθμισης αρχείου. Μπορείτε να ορίζετε τις παραμέτρους με "
 "το set var=val "
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Εκτέλεση μιας συγκεκριμένης για τη σελίδα εντολής"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Σφάλμα: Η εντολή δεν είναι αναγνωρίσιμη\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Προσπέραση αρχείου %s στο σύστημα %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Διακοπή της μεταφοράς στο σύστημα  %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Αδυναμία μεταφόρτωσης %s από %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1911,40 +1904,39 @@ msgstr ""
 "%d αρχεία ή κατάλογοι δε μπόρεσαν να μεταφερθούν. Ελέγξτε στο αρχείο "
 "καταγραφής ποια στοιχεία δεν μεταφέρθηκαν κανονικά."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Παρακαλώ πατήστε το κουμπί της διακοπής πριν να κάνετε οτιδήποτε άλλο\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Εκτέλεση σελιδοδείκτη"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 "Προσθήκη Σελιδοδείκτη: Θα πρέπει να εισάγετε ένα όνομα για αυτόν τον "
 "σελιδοδείκτη\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Προσθήκη Σελιδοδείκτη: Δεν είναι δυνατή η προσθήκη του  %s γιατί αυτό το "
 "όνομα υπάρχει ήδη\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Προσθήκη σελιδοδείκτη"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Προσθήκη σελιδοδείκτη: Θα πρέπει να εισάγετε ένα όνομα συστήματος\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1955,31 +1947,31 @@ msgstr ""
 "υπομενού \n"
 "(πχ: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Απομνημόνευση κωδικού"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Πρέπει να εισάγετε ένα όνομα για αυτόν το σελιδοδείκτη"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Εισάγετε το όνομα για το νέο φάκελο που θα δημιουργήσετε"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Νέο αντικείμενο"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Εισάγετε το όνομα για το νέο αντικείμενο που θα δημιουργήσετε"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1988,106 +1980,99 @@ msgstr ""
 "Είστε σιγουροι ότι θέλετε να διαγράψετε το σελιδοδείκτη\n"
 "%s και όλους τους θυγατρικούς του?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Διαγραφή σελιδοδείκτη"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Επεξεργασία καταχώρησης"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Όνομα συστήματος:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Απομακρυσμένος κατάλογος:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Τοπικός κατάλογος:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Όνομα χρήστη:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Λογαριασμός:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Ακύρωση  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Αρχείο/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Αρχείο/ Νέος _φάκελος...."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Αρχείο/ Νέο _αντικείμενο..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Αρχείο/_Διαγραφή"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Αρχείο/_διότητες..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Αρχείο/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Αρχείο/_Κλείσιμο"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Επεξεργασία Σελιδοδεικτών"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2095,92 +2080,91 @@ msgstr ""
 "Μπορείτε τώρα να προσαρμόσετε τα γνωρίσματα των αρχείων σας\n"
 "Σημείωση: Δεν υποστηρίζουν όλοι οι εξυπηρετητές ftp τη λειτουργία chmod "
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Ειδικό"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Χρήστης"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Ανάγνωση"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Εγγραφή"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Άλλο"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτά τα %ld αρχεία και %ld καταλόγους"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτά τα %ld αρχεία"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτούς τους %ld καταλόγους"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Διαγραφή αρχείων/καταλόγων"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Σύνδεση"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Ελήφθη URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Σύρε και άφησε"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2188,468 +2172,455 @@ msgstr ""
 "Αυτές είναι μεταφορές αρχείων που βρίσκονται σε εξέλιξη.\n"
 "Είστε σίγουροι ότι θέλετε να εγκαταλείψετε?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Άνοιγμα τοποθεσίας"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Εισάγετε url για να συνδεθείτε"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Παράθυρο _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Παράθυρο _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Δυαδικό"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Αρχείο/_Προτιμήσεις..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/Έ_ξοδος"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Τοπικά"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Τοπικά/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Τοπικά/Άνοιγμα _τοποθεσίας..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Τοπικά/Α_ποσύνδεση"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Τοπικά/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Τοπικά/Α_λλαγή φίλτρου ονόματος (προεπιλογή: *)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Τοπικά/Εμ_φάνιση επιλεγμένων"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Τοπικά/_Επιλογή όλων"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Τοπικά/Επιλογή όλων των αρχείων"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Τοπικά/Αποεπιλογή όλων"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Τοπικά/Αποθήκευση λίστας καταλόγου..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Τοπικά/Αποστολή εντολής SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Τοπικά/_Αλλαγή καταλόγου"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Τοπικά/Δ_ικαιώματα..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Τοπικά/Δημιουργία _καταλόγου..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Τοπικά/_Μετονομασία..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Τοπικά/_Διαγραφή..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Τοπικά/Επε_ξεργασία..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Τοπικά/Π_ροβολή..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Τοπικά/Α_νανέωση"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/Α_πομακρυσμένα"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Απομακρυσμένα/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Απομακρυσμένα/Άνοιγμα _τοποθεσίας..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Απομακρυσμένα/Α_ποσύνδεση"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Απομακρυσμένα/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Απομακρυσμένα/Α_λλαγή φίλτρου ονόματος..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Απομακρυσμένα/Εμ_φάνιση επιλεγμένων"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Απομακρυσμένα/_Επιλογή όλων"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Απομακρυσμένα/Επιλογή όλων των αρχείων"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Απομακρυσμένα/Αποεπιλογή όλων"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Απομακρυσμένα/Αποθήκευση λίστας καταλόγου..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Απομακρυσμένα/Αποστολή εντολής SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Απομακρυσμένα/_Αλλαγή καταλόγου"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Απομακρυσμένα/Δ_ικαιώματα..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Απομακρυσμένα/Νέος _κατάλογος...."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Απομακρυσμένα/_Μετονομασία..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Απομακρυσμένα/_Διαγραφή..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Απομακρυσμένα/Επε_ξεργασία..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Απομακρυσμένα/Π_ροβολή..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Απομακρυσμένα/Α_νανέωση"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Σελιδοδείκτες"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Σελιδοδείκτες/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Σελιδοδείκτες/Προσθήκη _σελιδοδείκτη"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Σελιδοδείκτες/Επεξεργασία σελιδοδεικτών"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Σελιδοδείκτες/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Μεταφορές"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Μεταφορές/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Μεταφορές/Έ_ναρξη"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Μεταφορές/_Διακοπή"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Μεταφορές/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Μεταφορές/Προσπέραση _τρέχοντος αρχείου"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Μεταφορές/_Αφαίρεση αρχείου"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Μεταφορές/Μετακίνηση αρχείου _πάνω"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Μεταφορές/Μετακίνηση αρχείου _κάτω"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Μεταφορές/_Λήψη αρχείων"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Μεταφορές/Τοπο_θέτηση αρχείων"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Καταγρα_φή"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Καταγραφή/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Καταγραφή/_Εκκαθάριση"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Καταγραφή/_Προβολή καταγραφής"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Καταγραφή/_Αποθήκευση καταγραφής..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Εργα_λεία"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Εργαλεία/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Εργαλεία/Σύγκριση παρα_θύρων"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Εργαλεία/Εκκαθάριση _λανθάνουσας μνήμης"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Βοήθεια"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Βοήθεια/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Βοήθεια/Π_ερί"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Σύστημα:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Σύστημα:"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Θύρα:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Χρήστης:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Χρήστης:"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Κωδικός:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Εντολή:"
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Όνομα αρχείου"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Γνωρίσματα"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Σφάλμα: Θα πρέπει να πληκτρολογήστε ένα σύστημα για να συνδεθείτε\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Εισάγετε όνομα χρήστη"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Παρακαλώ εισάγετε το όνομα χρήστη για αυτήν τη σελίδα"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Παρακαλώ εισάγετε τον κωδικό σας για αυτήν τη σελίδα"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr " Η λειτουργία ακυρώθηκε... θα πρέπει να εισάγετε ένα αλφαριθμητικό\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Δημιουργία καταλόγου"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Εισάγετε ένα όνομα για τον κατάλογο που θα δημιουργήσετε"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Σε τι θα θέλατε να μετονομάσετε το %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Σελίδα"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Εισάγετε τη συγκεκριμένη για την ιστοσελίδα εντολή"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Prepend with SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Συνέχεια"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Προσπέραση"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Μεταφορά αρχείων"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2658,61 +2629,61 @@ msgstr ""
 "υπολογιστή\n"
 "Παρακαλώ επιλέξτε τι θα θέλατε να κάνετε"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Προσπέραση αρχείου"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Αποεπιλογή όλων"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Αλλαγή φίλτρου ονόματος: Η λειτουργία ακυρώθηκε... θα πρέπει να εισάγετε ένα "
 "αλφαριθμητικό, ή '*' για επαναφορά στην αρχική λειτουργία\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Αλλαγή φίλτρου ονόματος"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Σφάλμα :Αδυναμία ανοίγματος %s για εγγραφή : %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Αποθήκευση λίστας καταλόγου"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Σφάλμα: Σφάλμα εγγραφής στο %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Επιτυχής εγγραφή στο αρχείο καταγραφής στο  %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Αποθήκευση καταγραφής"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2721,11 +2692,11 @@ msgstr ""
 "Αδυναμία εύρεσης του αρχείου άδειας χρήσης  COPYING. Βεβαιωθείτε ότι "
 "βρίσκεται είτε στο %s ή στο  %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Περί του gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2737,27 +2708,23 @@ msgstr ""
 "Επίσημη ισtοσελίδα: http://www.gftp.org/\n";
 "Λογότυπο από: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Περί"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Άδεια χρήσης"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Κλείσιμο  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Σύγκριση παραθύρων"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Αποσύνδεση από τον απομακρυσμένο εξυπηρετητή"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2766,73 +2733,57 @@ msgstr ""
 "κενό, τότε παρουσιάζεται ένας διάλογος που σας επιτρέπει να εισάγετε ένα  "
 "URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Χωρίς σύνδεση"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Σφάλμα ανοίγματος αρχείου %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Δεν έχει γίνει σύνδεση σε απομακρυσμένη σελίδα\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 "%s: Αυτή η λειτουργία δεν είναι διαθέσιμη με τη χρήση αυτού του πρωτοκόλλου\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Θα πρέπει να επιλέξετε μόνο ένα αντικείμενο\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Θα πρέπει να επιλέξετε τουλάχιστον ένα αντικείμενο\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr " Ναι  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Όχι  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Λήψη λιστών καταλόγου"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Διακοπή  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2841,109 +2792,89 @@ msgstr ""
 "Ελήφθησαν %ld κατάλογοι\n"
 "και %ld αρχεία"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Σφάλμα gFTP: Αδυναμία εύρεσης αρχείου %s σε %s ή %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Επεξεργασία συστήματος"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Προσθήκη συστήματος"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Τύπος:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Τύπος:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Τομέας"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Διεύθυνση δικτύου"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Διεύ_θυνση δικτύου:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etmask:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "Το_μέας:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netmask"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Τοπικά συστήματα"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Επεξεργασία"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Επιλογές"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Εφαρμογή"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Λήψη ονομάτων αρχείων..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Γίνεται σύνδεση..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Λήψη αρχείων: Δεν υπάρχει σύνδεση σε απομακρυσμένη σελίδα\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Σφάλμα: Θυγατρικό %d επιστράφηκε %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Το θυγατρικό %d επιστράφηκε επιτυχώς\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Σφάλμα:Η θυγατρική %d δεν τερματίστηκε σωστά\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Σφάλμα: Αδυναμία λήψης πληροφοριών για το αρχείο %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Το αρχείο %s δεν άλλαξε.\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2952,118 +2883,157 @@ msgstr ""
 "Το αρχείο %s άλλαξε.\n"
 "Θέλετε να το ανεβάσετε?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Επεξεργασία αρχείου"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Ληφθ %s από %s σε %.2fKB/s, %02d:%02d:%02d υπολ. απομένων χρόνος"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Στάληκαν %s από %s, η μεταφορά κόλλησε, άγνωστος απομένων χρόνος"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Ληφθ %s από %s, η μεταφορά κόλλησε, άγνωστος απομένων χρόνος"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Ολοκληρώθηκε άγνωστο ποσοστό. (Αρχείο %ld από %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 υπολ. απομένων χρόνος. (Αρχείο %ld από %"
-"ld)"
+"%d%% ολοκληρώθηκαν, %02d:%02d:%02d υπολ. απομένων χρόνος. (Αρχείο %ld από "
+"%ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Λήψη ονομάτων αρχείων...%s bytes"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Προβολή"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Προβολή: Αδυναμία δικράνωσης άλλης διεργασίας: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Σε εκτέλεση πρόγραμμα : %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Άνοιγμα %s με %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Προβολή αρχείου %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Προβολή: Αδυναμία ανοίγματος αρχείου %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Αδυναμία ανοίγματος τερματικού ελέγχου%s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Όνομα χρήστη [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s υπάρχει ήδη. (%s μέγεθος πηγής, %s μέγεθος προορισμού):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Ακύρωση  "
+
+#~ msgid "Host: "
+#~ msgstr "Σύστημα:"
+
+#~ msgid "User: "
+#~ msgstr "Χρήστης:"
+
+#~ msgid "  Close  "
+#~ msgstr "  Κλείσιμο  "
+
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
+
+#~ msgid "Cancel"
+#~ msgstr "Ακύρωση"
+
+#~ msgid "  Yes  "
+#~ msgstr " Ναι  "
+
+#~ msgid "  No  "
+#~ msgstr "  Όχι  "
+
+#~ msgid "Type:"
+#~ msgstr "Τύπος:"
+
+#~ msgid "Network Address"
+#~ msgstr "Διεύθυνση δικτύου"
+
+#~ msgid "_Edit"
+#~ msgstr "_Επεξεργασία"
+
+#~ msgid "Apply"
+#~ msgstr "Εφαρμογή"
diff --git a/po/en_CA.po b/po/en_CA.po
index ab54cf5..c1a4fc3 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -2,16 +2,17 @@
 # Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the gftp package.
 # Adam Weinberger <adamw gnome org>, 2004, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 19:55-0500\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2005-01-23 16:37-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
+"Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,40 +27,47 @@ msgstr "Invalid URL %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Error: Invalid line %s in cache index file\n"
 
-#: lib/cache.c:137 lib/fsp.c:537 lib/local.c:477
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Error: Could not make directory %s: %s\n"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error: Cannot create temporary file: %s\n"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:157 lib/config_file.c:163
-#: lib/local.c:102 lib/local.c:217 lib/rfc2068.c:259 lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Error closing file descriptor: %s\n"
 
-#: lib/cache.c:250 lib/fsp.c:128 lib/fsp.c:208 lib/local.c:136 lib/local.c:145
-#: lib/local.c:192
+#: 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 "Error: Cannot seek on file %s: %s\n"
 
-#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:3001
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:2708 lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, 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:2632 lib/sshv2.c:364
-#: lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Error: Could not read from socket: %s\n"
@@ -89,7 +97,7 @@ msgstr "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Warning: Line %d doesn't have enough arguments\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 "
@@ -99,7 +107,7 @@ msgstr ""
 "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or "
 "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"
@@ -153,8 +161,9 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Warning: Cannot open %s for writing: %s\n"
 
 #: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
@@ -173,8 +182,9 @@ msgstr ""
 "this, all passwords were stored in plaintext."
 
 #: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -182,8 +192,8 @@ msgstr ""
 "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"
 
-#: lib/config_file.c:1209 lib/protocols.c:383 lib/protocols.c:455
-#: lib/protocols.c:526 lib/rfc2068.c:545 lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
@@ -193,81 +203,82 @@ msgstr "<unknown>"
 msgid "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 msgstr "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 
-#: lib/fsp.c:190
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error: Cannot upload file %s\n"
 
-#: lib/fsp.c:200
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error: Cannot write to file %s: %s\n"
 
-#: lib/fsp.c:238
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error: Error closing file: %s\n"
 
-#: lib/fsp.c:326
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Corrupted file listing from FSP server %s\n"
 
-#: lib/fsp.c:338 lib/fsp.c:339 lib/protocols.c:1542 lib/protocols.c:1543
-#: lib/protocols.c:1584 lib/protocols.c:1585 lib/protocols.c:1648
-#: lib/protocols.c:1655 lib/protocols.c:1731 lib/protocols.c:1732
-#: lib/protocols.c:1768
+#: 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 "unknown"
 
-#: lib/fsp.c:376
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Could not get FSP directory listing %s: %s\n"
 
-#: lib/fsp.c:438
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Successfully changed directory to %s\n"
 
-#: lib/fsp.c:448
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Could not change directory to %s\n"
 
-#: lib/fsp.c:473 lib/fsp.c:502 lib/local.c:424 lib/local.c:447
-#: src/gtk/transfer.c:260 src/gtk/view_dialog.c:328
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Successfully removed %s\n"
 
-#: lib/fsp.c:479 lib/local.c:430
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Error: Could not remove directory %s: %s\n"
 
-#: lib/fsp.c:508 lib/local.c:453 src/gtk/transfer.c:264
-#: src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error: Could not remove file %s: %s\n"
 
-#: lib/fsp.c:530 lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Successfully made directory %s\n"
 
-#: lib/fsp.c:565 lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Successfully renamed %s to %s\n"
 
-#: lib/fsp.c:577 lib/local.c:503
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Error: Could not rename %s to %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"
@@ -283,100 +294,105 @@ msgstr ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 
-#: lib/local.c:71 lib/local.c:407
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Could not change local directory to %s: %s\n"
-
-#: lib/local.c:85 lib/local.c:392
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Could not get current working directory: %s\n"
 
-#: lib/local.c:183
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Successfully changed local directory to %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Could not change local directory to %s: %s\n"
+
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Error: Cannot truncate local file %s: %s\n"
 
-#: lib/local.c:347
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Could not get local directory listing %s: %s\n"
 
-#: lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Successfully changed local directory to %s\n"
-
-#: lib/local.c:520
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Successfully changed mode of %s to %o\n"
 
-#: lib/local.c:527
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Error: Could not change mode of %s to %o: %s\n"
 
-#: lib/local.c:623
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Successfully changed directory to %s\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Error: Could not change mode of %s to %o: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "local filesystem"
 
-#: lib/misc.c:401
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "usage: gftp "
 
-#: lib/misc.c:401 lib/rfc2068.c:303 src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "none"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "file"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "size"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "user"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "group"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datetime"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attribs"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "descending"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascending"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "View program:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -384,35 +400,27 @@ msgstr ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Edit program:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "The default program used to edit files."
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Startup Directory:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "The default directory gFTP will go to on startup"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Max Log Window Size:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "The maximum size of the log window in bytes for the GTK+ port"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Remote Character Sets:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -420,11 +428,11 @@ msgstr ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 
-#: lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Remove LC_TIME:"
 
-#: lib/options.h:55
+#: lib/options.h:58
 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."
@@ -432,168 +440,191 @@ msgstr ""
 "This is the value of LC_TIME for the remote site. This is so that dates can "
 "be parsed properly in the directory listings."
 
-#: lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: lib/options.h:60
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "The number of seconds to keep cache entries before they expire."
 
-#: lib/options.h:63
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Append file transfers"
 
-#: lib/options.h:65
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Append new file transfers onto existing ones"
 
-#: lib/options.h:66
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Do one transfer at a time"
 
-#: lib/options.h:68
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Do only one transfer at a time?"
 
-#: lib/options.h:69
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Overwrite by Default"
 
-#: lib/options.h:72
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Overwrite files by default or set to resume file transfers"
 
-#: lib/options.h:74
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Preserve file permissions"
 
-#: lib/options.h:77
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Preserve file permissions of transfered files"
 
-#: lib/options.h:79
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Preserve file time"
 
-#: lib/options.h:82
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Preserve file times of transferred files"
 
-#: lib/options.h:84
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Refresh after each file transfer"
 
-#: lib/options.h:87
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Refresh the listbox after each file is transfered"
 
-#: lib/options.h:89
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Sort directories first"
 
-#: lib/options.h:92
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Put the directories first then the files"
 
-#: lib/options.h:93
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Show hidden files"
 
-#: lib/options.h:96
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Show hidden files in the listboxes"
 
-#: lib/options.h:97
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Show transfer status in title"
 
-#: lib/options.h:99
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Show the file transfer status in the titlebar"
 
-#: lib/options.h:100
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Start file transfers"
 
-#: lib/options.h:102
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Automatically start the file transfers when they get queued"
 
-#: lib/options.h:104
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Allow manual commands in GUI"
 
-#: lib/options.h:106
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 
-#: lib/options.h:108 src/gtk/options_dialog.c:1023
-#: src/gtk/options_dialog.c:1243
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Remove a local directory"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Disconnect from the remote server"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Network"
 
-#: lib/options.h:110
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Network timeout:"
 
-#: lib/options.h:113
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 
-#: lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Connect retries:"
 
-#: lib/options.h:118
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "The number of times to auto-retry. Set this to 0 to retry indefinitely"
 
-#: lib/options.h:120
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Retry sleep time:"
 
-#: lib/options.h:123
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "The number of seconds to wait between retries"
 
-#: lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/S:"
 
-#: lib/options.h:127
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 
-#: lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Transfer Block Size:"
 
-#: lib/options.h:132
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 
-#: lib/options.h:135
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Default Protocol:"
 
-#: lib/options.h:137
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "This specifies the default protocol to use"
 
-#: lib/options.h:139 lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Enable IPv6 support"
 
-#: lib/options.h:147
+#: lib/options.h:159
 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"
@@ -601,27 +632,27 @@ msgstr ""
 "This defines what will happen when you double click a file in the file "
 "listboxes. 0=View file 1=Edit file 2=Transfer file"
 
-#: lib/options.h:150
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "The default width of the local files listbox"
 
-#: lib/options.h:153
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "The default width of the remote files listbox"
 
-#: lib/options.h:156
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "The default height of the local/remote files listboxes"
 
-#: lib/options.h:159
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "The default height of the transfer listbox"
 
-#: lib/options.h:162
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "The default height of the logging window"
 
-#: lib/options.h:165
+#: 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."
@@ -629,15 +660,15 @@ msgstr ""
 "The width of the filename column in the transfer window. Set this to 0 to "
 "have this column automagically resize."
 
-#: lib/options.h:173 lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "The default column to sort by"
 
-#: lib/options.h:176 lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sort ascending or descending"
 
-#: lib/options.h:186 lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -645,7 +676,7 @@ msgstr ""
 "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"
 
-#: lib/options.h:189 lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -653,7 +684,7 @@ msgstr ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 
-#: lib/options.h:192 lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -661,7 +692,7 @@ msgstr ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 
-#: lib/options.h:195 lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -669,7 +700,7 @@ msgstr ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 
-#: lib/options.h:198 lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -677,7 +708,7 @@ msgstr ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 
-#: lib/options.h:201 lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -685,55 +716,55 @@ msgstr ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 
-#: lib/options.h:222
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "The colour of the commands that are sent to the server"
 
-#: lib/options.h:225
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "The colour of the commands that are received from the server"
 
-#: lib/options.h:228
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "The colour of the error messages"
 
-#: lib/options.h:231
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "The colour of the rest of the log messages"
 
-#: lib/options.h:237 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:240 lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: lib/options.h:245 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:248 lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:257 src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "File transfer will be throttled to %.2f KB/s\n"
@@ -753,29 +784,7 @@ msgstr "Loading directory listing %s from cache (LC_TIME=%s)\n"
 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:454 lib/protocols.c:486 lib/protocols.c:525
-#: lib/protocols.c:557
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Error converting string '%s' from character set %s to character set %s: %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:469
-#, 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:540
-#, 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:629
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -784,114 +793,63 @@ msgstr ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 
-#: lib/protocols.c:647
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: Cannot write to cache: %s\n"
 
-#: lib/protocols.c:680
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: Could not find bookmark %s\n"
 
-#: lib/protocols.c:687
+#: lib/protocols.c:521
 #, 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:822
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "The protocol '%s' is currently not supported.\n"
 
-#: lib/protocols.c:1168 lib/protocols.c:1183 lib/protocols.c:2215
-#: lib/protocols.c:2325
+#: lib/protocols.c:1153
 #, c-format
-msgid "Looking up %s\n"
-msgstr "Looking up %s\n"
-
-#: lib/protocols.c:1174 lib/protocols.c:1189 lib/protocols.c:2220
-#: lib/protocols.c:2330
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Cannot look up hostname %s: %s\n"
-
-#: lib/protocols.c:2238
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Failed to create a socket: %s\n"
-
-#: lib/protocols.c:2244 lib/protocols.c:2347
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Trying %s:%d\n"
-
-#: lib/protocols.c:2249 lib/protocols.c:2354
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Cannot connect to %s: %s\n"
-
-#: lib/protocols.c:2284 lib/rfc959.c:640
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Failed to create a IPv4 socket: %s\n"
-
-#: lib/protocols.c:2308 lib/sshv2.c:1046
-#, 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:2370 lib/protocols.c:3010 lib/rfc959.c:649 lib/rfc959.c:826
-#, 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:2377
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Connected to %s:%d\n"
-
-#: lib/protocols.c:2608 lib/protocols.c:2683 lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Connection to %s timed out\n"
-
-#: lib/protocols.c:2751
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Cannot get socket flags: %s\n"
-
-#: lib/protocols.c:2765
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Cannot set socket to non-blocking: %s\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:2900
+#: lib/protocols.c:1531
 #, 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:2908
+#: lib/protocols.c:1539
 #, 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"
 
-#: lib/pty.c:297
+#: lib/protocols.c:1634 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 "Error: Cannot set close on exec flag: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Cannot open master pty %s: %s\n"
 
-#: lib/pty.c:305
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Cannot create a socket pair: %s\n"
 
-#: lib/pty.c:334
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error: Cannot execute ssh: %s\n"
 
-#: lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Cannot fork another process: %s\n"
@@ -936,7 +894,7 @@ msgstr "Use HTTP/1.1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Do you want to use HTTP/1.1 or HTTP/1.0"
 
-#: lib/rfc2068.c:150 lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -945,25 +903,25 @@ msgstr ""
 "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:1123
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Disconnecting from site %s\n"
 
-#: lib/rfc2068.c:303
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Starting the file transfer at offset "
 
-#: lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Cannot retrieve file %s\n"
 
-#: lib/rfc2068.c:423 lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Retrieving directory listing...\n"
 
-#: lib/rfc2068.c:819 lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Received wrong response from server, disconnecting\n"
 
@@ -1097,10 +1055,11 @@ msgid "Transfer files in ASCII mode"
 msgstr "Transfer files in ASCII mode"
 
 #: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1110,77 +1069,132 @@ msgstr ""
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 
-#: lib/rfc959.c:322 lib/rfc959.c:331 lib/rfc959.c:342 lib/rfc959.c:789
-#: lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Invalid response '%c' received from server.\n"
 
-#: lib/rfc959.c:679 lib/rfc959.c:689
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Failed to create a IPv4 socket: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, 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:715
+#: lib/rfc959.c:775
 #, 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:726 lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Cannot create a data connection: %s\n"
 
-#: lib/rfc959.c:738 lib/rfc959.c:759 lib/rfc959.c:912
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Cannot get socket name: %s\n"
 
-#: lib/rfc959.c:749 lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Cannot bind a port: %s\n"
 
-#: lib/rfc959.c:768 lib/rfc959.c:921
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Cannot listen on port %d: %s\n"
 
-#: lib/rfc959.c:817
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Failed to create a IPv6 socket: %s\n"
 
-#: lib/rfc959.c:837
+#: lib/rfc959.c:895
 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:865 lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Invalid EPSV response '%s'\n"
 
-#: lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Cannot get address of local socket: %s\n"
 
-#: lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Cannot accept connection from server: %s\n"
 
-#: lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Warning: Cannot parse listing %s\n"
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Looking up %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 "Cannot look up hostname %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Failed to create a socket: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Trying %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 "Cannot connect to %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Connected to %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 "Cannot look up service name %s/tcp. Please check your services file\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Connection to %s timed out\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Cannot get socket flags: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Cannot set socket to non-blocking: %s\n"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -1209,172 +1223,169 @@ msgstr "Need SSH User/Pass"
 msgid "Require a username/password for SSH connections"
 msgstr "Require a username/password for SSH connections"
 
-#: lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Running program %s\n"
 
-#: lib/sshv2.c:307
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Enter passphrase for RSA key"
 
-#: lib/sshv2.c:308
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Enter passphrase for key '"
 
-#: lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Password"
 
-#: lib/sshv2.c:310
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "password"
 
-#: lib/sshv2.c:414
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Enter PASSCODE:"
 
-#: lib/sshv2.c:436 src/gtk/gtkui.c:118 src/gtk/transfer.c:553
-#: src/gtk/transfer.c:563
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Enter SecurID Password:"
 
-#: lib/sshv2.c:487
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Error: An incorrect password was entered\n"
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protocol Initialization\n"
 
-#: lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protocol version %d\n"
 
-#: lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Open %s\n"
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Close\n"
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Open Directory %s\n"
 
-#: lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Read Directory\n"
 
-#: lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Remove file %s\n"
 
-#: lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Make directory %s\n"
 
-#: lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Remove directory %s\n"
 
-#: lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: File attributes\n"
 
-#: lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:609 src/gtk/bookmarks.c:1045 src/gtk/bookmarks.c:1298
-#: src/gtk/chmod_dialog.c:253 src/gtk/gtkui_transfer.c:368
-#: src/gtk/misc-gtk.c:1011 src/gtk/options_dialog.c:1208
-#: src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: lib/sshv2.c:615
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "No such file or directory"
 
-#: lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Failure"
 
-#: lib/sshv2.c:624
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Bad message"
 
-#: lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "No connection"
 
-#: lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Connection lost"
 
-#: lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operation unsupported"
 
-#: lib/sshv2.c:636
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Unknown message returned from server"
 
-#: lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Error: Message size %d too big\n"
 
-#: lib/sshv2.c:730 lib/sshv2.c:1225 lib/sshv2.c:1821 lib/sshv2.c:1959
+#: 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 "Error: Message size %d too big from server\n"
 
-#: lib/sshv2.c:736
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1382,12 +1393,12 @@ msgstr ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 
-#: lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Opening SSH connection to %s\n"
 
-#: lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Successfully logged into SSH server %s\n"
@@ -1433,7 +1444,7 @@ msgstr ""
 msgid "Cannot get peer certificate\n"
 msgstr "Cannot get peer certificate\n"
 
-#: lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1442,55 +1453,45 @@ msgstr ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 
-#: lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Cannot initialize the OpenSSL library\n"
 
-#: lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Error loading default SSL certificates\n"
 
-#: lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Error setting cipher list (no valid ciphers)\n"
 
-#: lib/sslcommon.c:342 lib/sslcommon.c:416 lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Error: SSL engine was not initialized\n"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Error setting up SSL connection (BIO object)\n"
 
-#: lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Error setting up SSL connection (SSL object)\n"
 
-#: lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Error with peer certificate: %s\n"
 
-#: src/uicommon/gftpui.c:91
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Waiting %d seconds until trying to connect again\n"
-
-#: src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operation cancelled\n"
 
-#: src/uicommon/gftpui.c:190
-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 ""
-">. 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";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Waiting %d seconds until trying to connect again\n"
 
-#: src/uicommon/gftpui.c:191
+#: 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 "
@@ -1500,73 +1501,73 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it under certain "
 "conditions; for details, see the COPYING file\n"
 
-#: src/uicommon/gftpui.c:193 src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Translated by"
 
-#: src/uicommon/gftpui.c:240 src/uicommon/gftpui.c:282
-#: 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:872
+#: 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 "Error: Not connected to a remote site\n"
 
-#: src/uicommon/gftpui.c:251
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "usage: chmod <mode> <file>\n"
 
-#: src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "usage: rename <old name> <new name>\n"
 
-#: src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "usage: delete <file>\n"
 
-#: src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "usage: rmdir <directory>\n"
 
-#: src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "usage: site <site command>\n"
 
-#: src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "usage: mkdir <new directory>\n"
 
-#: src/uicommon/gftpui.c:469 src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "usage: chdir <directory>\n"
 
-#: src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Invalid argument\n"
 
-#: src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Clear the directory cache\n"
 
-#: src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "usage: open "
 
-#: src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "usage: set [variable = value]\n"
 
-#: src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Error: Variable %s is not a valid configuration variable.\n"
 
-#: src/uicommon/gftpui.c:754
+#: src/uicommon/gftpui.c:725
 #, c-format
 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:836
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1574,286 +1575,294 @@ msgstr ""
 "Supported commands:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "usage: %s <filespec>\n"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Shows gFTP information"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 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:968
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 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:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: src/uicommon/gftpui.c:971 src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Changes the remote working directory"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Changes the permissions of a remote file"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Available options: cache"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Disconnects from the remote site"
 
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Removes a remote file"
 
-#: src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: src/uicommon/gftpui.c:983 src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Shows the directory listing for the current remote directory"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: src/uicommon/gftpui.c:985 src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Downloads remote file(s)"
 
-#: src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Shows this help screen"
 
-#: src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: src/uicommon/gftpui.c:989 src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Changes the local working directory"
 
-#: src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Changes the permissions of a local file"
 
-#: src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Removes a local file"
 
-#: src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: src/uicommon/gftpui.c:997 src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Shows the directory listing for the current local directory"
 
-#: src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Creates a local directory"
 
-#: src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Show current local directory"
 
-#: src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Rename a local file"
 
-#: src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Remove a local directory"
 
-#: src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Creates a remote directory"
 
-#: src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: src/uicommon/gftpui.c:1015 src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Uploads local file(s)"
 
-#: src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Opens a connection to a remote site"
 
-#: src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Show current remote directory"
 
-#: src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Exit from gFTP"
 
-#: src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Rename a remote file"
 
-#: src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Remove a remote directory"
 
-#: src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 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:1031
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Run a site specific command"
 
-#: src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Error: Command not recognized\n"
 
-#: src/uicommon/gftpui.c:1375
-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:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Successfully transferred %s at %.2f KB/s\n"
 
-#: src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Could not download %s from %s\n"
+msgid "Skipping file %s on host %s\n"
+msgstr "Skipping file %s on host %s\n"
 
-#: src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Successfully transferred %s at %.2f KB/s\n"
+msgid "Stopping the transfer on host %s\n"
+msgstr "Stopping the transfer on host %s\n"
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Could not download %s from %s\n"
 
-#: src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "There was an error transfering the file %s"
-msgstr "There was an error transferring the file %s"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:213
-#: src/gtk/gftp-gtk.c:1063 src/gtk/misc-gtk.c:512 src/gtk/misc-gtk.c:520
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Please hit the stop button first to do anything else\n"
@@ -1894,131 +1903,135 @@ msgstr ""
 msgid "Remember password"
 msgstr "Remember password"
 
-#: src/gtk/bookmarks.c:473 src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Add Bookmark: You must enter a name for the bookmark\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "New Folder"
 
-#: src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Enter the name of the new folder to create"
 
-#: src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/File/New Item..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Enter the name of the new item to create"
 
-#: src/gtk/bookmarks.c:557
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all it's children?"
 
-#: src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Delete Bookmark"
 
-#: src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: src/gtk/bookmarks.c:850 src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Edit Entry"
 
-#: src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Description:"
 
-#: src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Remote Directory:"
 
-#: src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Local Directory:"
 
-#: src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Username:"
 
-#: src/gtk/bookmarks.c:1003 src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Log in as ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1056 src/gtk/bookmarks.c:1309
-#: src/gtk/chmod_dialog.c:265 src/gtk/gtkui_transfer.c:380
-#: src/gtk/options_dialog.c:1219 src/gtk/options_dialog.c:1453
-msgid "  Cancel  "
-msgstr "  Cancel  "
-
-#: src/gtk/bookmarks.c:1065 src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Apply"
-
-#: src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/File/New Folder..."
 
-#: src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/File/New Item..."
 
-#: src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/File/Delete"
 
-#: src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/File/Properties..."
 
-#: src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/File/Close"
 
-#: src/gtk/bookmarks.c:1240 src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edit Bookmarks"
 
-#: src/gtk/chmod_dialog.c:132 src/gtk/chmod_dialog.c:137
-#: src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2026,46 +2039,46 @@ msgstr ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 
-#: src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Special"
 
-#: src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/gtk/chmod_dialog.c:192 src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "User"
 
-#: src/gtk/chmod_dialog.c:200 src/gtk/chmod_dialog.c:220
-#: src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Read"
 
-#: src/gtk/chmod_dialog.c:204 src/gtk/chmod_dialog.c:224
-#: src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Write"
 
-#: src/gtk/chmod_dialog.c:208 src/gtk/chmod_dialog.c:228
-#: src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Execute"
 
-#: src/gtk/chmod_dialog.c:212 src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Group"
 
-#: src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Other"
 
@@ -2088,12 +2101,11 @@ msgstr "Are you sure you want to delete these %ld directories"
 msgid "Delete Files/Directories"
 msgstr "Delete Files/Directories"
 
-#: src/gtk/delete_dialog.c:90 src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1064 src/gtk/misc-gtk.c:946
-#: src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connect"
 
@@ -2106,11 +2118,11 @@ msgstr "Received URL %s\n"
 msgid "Drag-N-Drop"
 msgstr "Drag-N-Drop"
 
-#: src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Exit"
 
-#: src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2118,469 +2130,508 @@ msgstr ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 
-#: src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr "Connect via URL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Options"
 
-#: src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Enter a URL to connect to"
 
-#: src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "OpenURL"
-
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Window 1"
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Window 2"
 
-#: src/gtk/gftp-gtk.c:250 src/gtk/gftp-gtk.c:255 src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binary"
 
-#: src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Options..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/File/Properties..."
 
-#: src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Quit"
 
-#: src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Local/Open URL..."
 
-#: src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Local/Disconnect"
 
-#: src/gtk/gftp-gtk.c:264 src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Local/Change Filespec..."
 
-#: src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Local/Show selected"
 
-#: src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Local/Select All"
 
-#: src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Select All Files"
 
-#: src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselect All"
 
-#: src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Save Directory Listing..."
 
-#: src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Send SITE Command..."
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Local/Change Directory"
 
-#: src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Local/Chmod..."
 
-#: src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Local/Make Directory..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/File/New Folder..."
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Local/Rename..."
 
-#: src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Local/Delete..."
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Local/Edit..."
 
-#: src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Local/View..."
 
-#: src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Local/Refresh"
 
-#: src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remote"
 
-#: src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Remote/Open _URL..."
 
-#: src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Remote/Disconnect"
 
-#: src/gtk/gftp-gtk.c:287 src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Remote/Change Filespec..."
 
-#: src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Remote/Show selected"
 
-#: src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Remote/Select All"
 
-#: src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remote/Select All Files"
 
-#: src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remote/Deselect All"
 
-#: src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remote/Save Directory Listing..."
 
-#: src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remote/Send SITE Command..."
 
-#: src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Remote/Change Directory"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Remote/Chmod..."
 
-#: src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr "/Remote/Make Directory..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/File/New Folder..."
 
-#: src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Remote/Rename..."
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Remote/Delete..."
 
-#: src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Remote/Edit..."
 
-#: src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Remote/View..."
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Remote/Refresh"
 
-#: src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bookmarks"
 
-#: src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bookmarks/tearoff"
 
-#: src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bookmarks/Add bookmark"
 
-#: src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bookmarks/Edit bookmarks"
 
-#: src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bookmarks/sep"
 
-#: src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Transfers"
 
-#: src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Transfers/tearoff"
 
-#: src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/Transfers/Start Transfer"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Transfers/tearoff"
 
-#: src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/Transfers/Stop Transfer"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Transfers/sep"
 
-#: src/gtk/gftp-gtk.c:315 src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Transfers/sep"
 
-#: src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Transfers/Skip Current File"
 
-#: src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Transfers/Remove File"
 
-#: src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Transfers/Move File Up"
 
-#: src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Transfers/Move File Down"
 
-#: src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfers/Retrieve Files"
 
-#: src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Transfers/Put Files"
 
-#: src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/L_ogging"
 
-#: src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Logging/tearoff"
 
-#: src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Logging/Clear"
 
-#: src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
 msgstr "/Logging/View log"
 
-#: src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Logging/Save log..."
 
-#: src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Tool_s"
 
-#: src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tools/tearoff"
 
-#: src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/Compare Windows"
 
-#: src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Tools/Clear Cache"
 
-#: src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Help"
 
-#: src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Help/About"
 
-#: src/gtk/gftp-gtk.c:458
-msgid "Host: "
-msgstr "Host: "
-
-#: src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Host: "
 
-#: src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: src/gtk/gftp-gtk.c:507
-msgid "User: "
-msgstr "User: "
-
-#: src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_User: "
 
-#: src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Pass: "
 
-#: src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Command: "
 
-#: src/gtk/gftp-gtk.c:746 src/gtk/gftp-gtk.c:952 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Size"
 
-#: src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Date"
 
-#: src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attribs"
 
-#: src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Error: You must type in a host to connect to\n"
 
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Enter Username"
 
-#: src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Please enter your username for this site"
 
-#: src/gtk/gtkui.c:119 src/gtk/transfer.c:554 src/gtk/transfer.c:564
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Please enter your password for this site"
 
-#: src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operation cancelled...you must enter a string\n"
 
-#: src/gtk/gtkui.c:317
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Make Directory"
 
-#: src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Enter name of directory to create"
 
-#: src/gtk/gtkui.c:343 src/gtk/gtkui.c:355 src/gtk/misc-gtk.c:949
-#: src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rename"
 
-#: src/gtk/gtkui.c:353
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "What would you like to rename %s to?"
 
-#: src/gtk/gtkui.c:375 src/gtk/gtkui.c:378
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: src/gtk/gtkui.c:378
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Enter site-specific command"
 
-#: src/gtk/gtkui.c:379
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Prepend with SITE"
 
-#: src/gtk/gtkui.c:422 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:449 src/gtk/transfer.c:532
-#: src/gtk/transfer.c:1011
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Skipped"
 
-#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:511 src/gtk/transfer.c:536
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:303
-#: src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:309
-#: src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Resume"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Skip"
 
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Action"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transfer Files"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2588,59 +2639,59 @@ msgstr ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 
-#: src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Skip File"
 
-#: src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Select All"
 
-#: src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselect All"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "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
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Change Filespec"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Enter the new file specification"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:377
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Error: Cannot open %s for writing: %s\n"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Save Directory Listing"
 
-#: src/gtk/menu-items.c:341 src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Error: Error writing to %s: %s\n"
 
-#: src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Successfully wrote the log file to %s\n"
 
-#: src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Save Log"
 
-#: src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2649,44 +2700,39 @@ msgstr ""
 "Cannot find the licence agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 
-#: src/gtk/menu-items.c:468 src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "About gFTP"
 
-#: src/gtk/menu-items.c:504
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 "Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "About"
 
-#: src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: src/gtk/menu-items.c:571 src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr "  Close  "
-
-#: src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compare Windows"
 
-#: src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Disconnect from the remote server"
 
-#: src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2694,72 +2740,56 @@ msgstr ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialogue is presented that will allow you to enter a URL."
 
-#: src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "All Files"
 
-#: src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Not connected"
 
-#: src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Error opening file %s: %s\n"
 
-#: src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Not connected to a remote site\n"
 
-#: src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: This feature is not available using this protocol\n"
 
-#: src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: You must only have one item selected\n"
 
-#: src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: You must have at least one item selected\n"
 
-#: src/gtk/misc-gtk.c:943 src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Change"
 
-#: src/gtk/misc-gtk.c:1014 src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Add"
-
-#: src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Cancel"
-
-#: src/gtk/misc-gtk.c:1110
-msgid "  Yes  "
-msgstr "  Yes  "
-
-#: src/gtk/misc-gtk.c:1120
-msgid "  No  "
-msgstr "  No  "
-
-#: src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Getting directory listings"
 
-#: src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2768,64 +2798,48 @@ msgstr ""
 "Received %ld directories\n"
 "and %ld files"
 
-#: src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Error: Cannot find file %s in %s or %s\n"
 
-#: src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Edit Host"
 
-#: src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Add Host"
 
-#: src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Type:"
-
-#: src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type:"
 
-#: src/gtk/options_dialog.c:1017 src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domain"
 
-#: src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr "Network Address"
-
-#: src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Network address:"
 
-#: src/gtk/options_dialog.c:1091 src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr "Netmask"
-
-#: src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etmask:"
 
-#: src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domain:"
 
-#: src/gtk/options_dialog.c:1250
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netmask"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Local Hosts"
 
-#: src/gtk/options_dialog.c:1291 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Edit"
-
-#: src/gtk/options_dialog.c:1293
-msgid "_Edit"
-msgstr "_Edit"
-
-#: src/gtk/options_dialog.c:1370 src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Options"
 
@@ -2833,7 +2847,7 @@ msgstr "Options"
 msgid "Receiving file names..."
 msgstr "Receiving file names..."
 
-#: src/gtk/transfer.c:63 src/gtk/transfer.c:680
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Connecting..."
 
@@ -2841,32 +2855,32 @@ msgstr "Connecting..."
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Retrieve Files: Not connected to a remote site\n"
 
-#: src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Error: Child %d returned %d\n"
 
-#: src/gtk/transfer.c:357
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Child %d returned successfully\n"
 
-#: src/gtk/transfer.c:361
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Error: Child %d did not terminate properly\n"
 
-#: src/gtk/transfer.c:371
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Error: Cannot get information about file %s: %s\n"
 
-#: src/gtk/transfer.c:376
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "File %s was not changed\n"
 
-#: src/gtk/transfer.c:384
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2875,118 +2889,207 @@ msgstr ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 
-#: src/gtk/transfer.c:387
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Edit File"
 
-#: src/gtk/transfer.c:452
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtk/transfer.c:492
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Stopping the transfer of %s\n"
-
-#: src/gtk/transfer.c:726
-#, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
-msgstr "Unknown percentage complete. (File %ld of %ld)"
-
-#: src/gtk/transfer.c:730
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 
-#: src/gtk/transfer.c:760
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 
-#: src/gtk/transfer.c:769
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Recv %s of %s, transfer stalled, unknown time remaining"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s, transfer stalled, unknown time remaining"
 
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr "Unknown percentage complete. (File %ld of %ld)"
+
 #: src/gtk/transfer.c:804
 #, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+
+#: src/gtk/transfer.c:842
+#, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Retrieving file names...%s bytes"
 
-#: src/gtk/transfer.c:883 src/gtk/transfer.c:905 src/gtk/transfer.c:939
-#: src/gtk/transfer.c:979 src/gtk/transfer.c:1032 src/gtk/transfer.c:1092
+#: 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 "There are no file transfers selected\n"
 
-#: src/gtk/transfer.c:923
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Stopping the transfer on host %s\n"
-
-#: src/gtk/transfer.c:964 src/gtk/transfer.c:1017
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Skipping file %s on host %s\n"
-
-#: src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "View"
 
-#: src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edit"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "View: %s is a directory. Cannot view it.\n"
 
-#: 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 dialogue\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 "Edit: %s is a directory. Cannot edit it.\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 "Edit: You must specify an editor in the options dialogue\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "View: Cannot fork another process: %s\n"
 
-#: src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Running program: %s %s\n"
 
-#: src/gtk/view_dialog.c:271
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Opening %s with %s\n"
 
-#: src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viewing file %s\n"
 
-#: src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "View: Cannot open file %s: %s\n"
 
-#: src/text/gftp-text.c:167
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Cannot open controlling terminal %s\n"
 
-#: src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Username [anonymous]:"
 
-#: src/text/textui.c:143
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Startup Directory:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "The default directory gFTP will go to on startup"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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 ""
+#~ ">. 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";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr "Error: Remote site disconnected after trying to transfer file\n"
+
+#~ msgid "There was an error transfering the file %s"
+#~ msgstr "There was an error transferring the file %s"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancel  "
+
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Connect via URL"
+
+#~ msgid "OpenURL"
+#~ msgstr "OpenURL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Options..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Local/Make Directory..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Remote/Make Directory..."
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Transfers/Start Transfer"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Transfers/Stop Transfer"
+
+#~ msgid "Host: "
+#~ msgstr "Host: "
+
+#~ msgid "User: "
+#~ msgstr "User: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Close  "
+
+#~ msgid "Add"
+#~ msgstr "Add"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Yes  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Network Address"
+#~ msgstr "Network Address"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Stopping the transfer of %s\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index e3af553..9867e88 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,939 +7,892 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-14 07:02+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-03-14 07:02-0000\n"
 "Last-Translator: David Lodge <dave cirt net>\n"
 "Language-Team:  <en li org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Invalid URL %s\n"
 
-#: ../lib/cache.c:50
-#: ../lib/cache.c:64
-#: ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Error: Invalid line %s in cache index file\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 "Error: Could not make directory %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error: Cannot create temporary file: %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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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 "Error closing file descriptor: %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 "Error: Cannot seek on file %s: %s\n"
 
-#: ../lib/config_file.c:126
-#: ../lib/config_file.c:133
-#: ../lib/protocols.c:3158
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:2859
-#: ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, 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: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:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Error: Could not read from socket: %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 Error: Bad bookmarks file name %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Warning: Cannot find master bookmark file %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 Error: Cannot open bookmarks file %s: %s\n"
 
-#: ../lib/config_file.c:295
-#: ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Warning: Line %d doesn't have enough arguments\n"
 
-#: ../lib/config_file.c:505
-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 "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"
+#: 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 ""
+"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"
 
-#: ../lib/config_file.c:508
-msgid "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: All arguments except the 
file extension are optional"
-msgstr "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: All arguments except the 
file extension are optional"
+#: 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 ""
+"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
+"All arguments except the file extension are optional"
 
-#: ../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 Error: Bad config file name %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 Error: Could not make directory %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 Error: Cannot find master config file %s\n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Did you do a make install?\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 Error: Cannot open config file %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 "Terminating due to parse errors at line %d in the config file\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 Warning: Skipping line %d in config file: %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 Error: Bad log file name %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 Warning: Cannot open %s for writing: %s\n"
 
-#: ../lib/config_file.c:733
-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 "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"
+#: 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 ""
+"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"
 
-#: ../lib/config_file.c:734
-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 someone standing over your shoulder while you're editing 
this file. Prior to this, all passwords were stored in plaintext."
-msgstr "Note: The passwords contained inside this file are scrambled. This algorithm is not secure. This is 
to avoid your password being easily remembered by someone standing over your shoulder while you're editing 
this file. Prior to this, all passwords were stored in plaintext."
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
 
-#: ../lib/config_file.c:846
-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 "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"
+#: 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 ""
+"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"
 
-#: ../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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../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 "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error: Cannot upload file %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error: Cannot write to file %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error: Error closing file: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Corrupted file listing from FSP server %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 "unknown"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Could not get FSP directory listing %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Successfully changed directory to %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Could not change directory to %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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Successfully removed %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 "Error: Could not remove directory %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:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error: Could not remove file %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 "Successfully made directory %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 "Successfully renamed %s to %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 "Error: Could not rename %s to %s: %s\n"
 
-#: ../lib/ftps.c:157
-msgid "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 
-#: ../lib/https.c:91
-msgid "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Could not get current working directory: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Successfully changed local directory to %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Could not change local directory to %s: %s\n"
 
-#: ../lib/local.c:248
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Error: Cannot truncate local file %s: %s\n"
 
-#: ../lib/local.c:434
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Could not get local directory listing %s: %s\n"
 
-#: ../lib/local.c:644
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Successfully changed mode of %s to %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 "Error: Could not change mode of %s to %o: %s\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Successfully changed the time stamp of %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 "Error: Could not change the time stamp of %s: %s\n"
 
-#: ../lib/local.c:760
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "local filesystem"
 
-#: ../lib/misc.c:407
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "usage: 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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "none"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "file"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "size"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "user"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "group"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datetime"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attribs"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descending"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascending"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "View program:"
 
-#: ../lib/options.h:44
-msgid "The default program used to view files. If this is blank, the internal file viewer will be used"
-msgstr "The default program used to view files. If this is blank, the internal file viewer will be used"
+#: lib/options.h:44
+msgid ""
+"The default program used to view files. If this is blank, the internal file "
+"viewer will be used"
+msgstr ""
+"The default program used to view files. If this is blank, the internal file "
+"viewer will be used"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Edit program:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "The default program used to edit files."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Max Log Window Size:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "The maximum size of the log window in bytes for the GTK+ port"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Remote Character Sets:"
 
-#: ../lib/options.h:54
-msgid "This is a comma separated list of charsets to try to convert the remote messages to the current 
locale"
-msgstr "This is a comma separated list of charsets to try to convert the remote messages to the current 
locale"
+#: lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
+msgstr ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Remote LC_TIME:"
 
-#: ../lib/options.h:58
-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 "This is the value of LC_TIME for the remote site. This is so that dates can be parsed properly in 
the directory listings."
+#: lib/options.h:58
+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 ""
+"This is the value of LC_TIME for the remote site. This is so that dates can "
+"be parsed properly in the directory listings."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "The number of seconds to keep cache entries before they expire."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Append file transfers"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Append new file transfers onto existing ones"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Do one transfer at a time"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Do only one transfer at a time?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Overwrite by Default"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Overwrite files by default or set to resume file transfers"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Preserve file permissions"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Preserve file permissions of transfered files"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Preserve file time"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Preserve file times of transferred files"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Refresh after each file transfer"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Refresh the listbox after each file is transfered"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Sort directories first"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Put the directories first then the files"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Show hidden files"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Show hidden files in the listboxes"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Show transfer status in title"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Show the file transfer status in the titlebar"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Start file transfers"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Automatically start the file transfers when they get queued"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Allow manual commands in GUI"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Remember last directory"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr "Save the last local and remote directory when the application is closed"
+msgstr ""
+"Save the last local and remote directory when the application is closed"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Connect to remote server on startup"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
-msgstr "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+"Automatically connect to the remote server when the application is started."
 
-#: ../lib/options.h:120
-#: ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Network"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Network timeout:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Connect retries:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Retry sleep time:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "The number of seconds to wait between retries"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Transfer Block Size:"
 
-#: ../lib/options.h:144
-msgid "The block size that is used when transfering files. This should be a multiple of 1024."
-msgstr "The block size that is used when transfering files. This should be a multiple of 1024."
+#: lib/options.h:144
+#, fuzzy
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+"The block size that is used when transfering files. This should be a "
+"multiple of 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Default Protocol:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "This specifies the default protocol to use"
 
-#: ../lib/options.h:151
-#: ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Enable IPv6 support"
 
-#: ../lib/options.h:159
-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 "This defines what will happen when you double click a file in the file listboxes. 0=View file 1=Edit 
file 2=Transfer file"
+#: lib/options.h:159
+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 ""
+"This defines what will happen when you double click a file in the file "
+"listboxes. 0=View file 1=Edit file 2=Transfer file"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "The default width of the local files listbox"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "The default width of the remote files listbox"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "The default height of the local/remote files listboxes"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "The default height of the transfer listbox"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "The default height of the logging window"
 
-#: ../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 "The width of the filename column in the transfer window. Set this to 0 to have this column 
automagically resize."
+#: 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 ""
+"The width of the filename column in the transfer window. Set this to 0 to "
+"have this column automagically resize."
 
-#: ../lib/options.h:190
-#: ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "The default column to sort by"
 
-#: ../lib/options.h:193
-#: ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sort ascending or descending"
 
-#: ../lib/options.h:203
-#: ../lib/options.h:221
-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 "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"
-
-#: ../lib/options.h:206
-#: ../lib/options.h:224
-msgid "The width of the size column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "The width of the size column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-
-#: ../lib/options.h:209
-#: ../lib/options.h:227
-msgid "The width of the user column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "The width of the user column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-
-#: ../lib/options.h:212
-#: ../lib/options.h:230
-msgid "The width of the group column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "The width of the group column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-
-#: ../lib/options.h:215
-#: ../lib/options.h:233
-msgid "The width of the date column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "The width of the date column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-
-#: ../lib/options.h:218
-#: ../lib/options.h:236
-msgid "The width of the attribs column in the file listboxes. Set this to 0 to have this column 
automagically resize. Set this to -1 to disable this column"
-msgstr "The width of the attribs column in the file listboxes. Set this to 0 to have this column 
automagically resize. Set this to -1 to disable this column"
-
-#: ../lib/options.h:239
+#: lib/options.h:203 lib/options.h:221
+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 ""
+"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"
+
+#: lib/options.h:206 lib/options.h:224
+msgid ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+
+#: lib/options.h:209 lib/options.h:227
+msgid ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+
+#: lib/options.h:212 lib/options.h:230
+msgid ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+
+#: lib/options.h:215 lib/options.h:233
+msgid ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+
+#: lib/options.h:218 lib/options.h:236
+msgid ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "The colour of the commands that are sent to the server"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "The colour of the commands that are received from the server"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "The colour of the error messages"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "The colour of the rest of the log messages"
 
-#: ../lib/options.h:254
-#: ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257
-#: ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262
-#: ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265
-#: ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274
-#: ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, 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:378
+#: lib/protocols.c:379
 #, 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:389
+#: lib/protocols.c:390
 #, 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:399
+#: lib/protocols.c:400
 #, 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:461
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "Error converting string '%s' from character set %s to character set %s: %s\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, c-format
-msgid "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't match the current directory 
(%s)\n"
-msgstr "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't match the current directory 
(%s)\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
+msgstr ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: Cannot write to cache: %s\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: Could not find bookmark %s\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, 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:842
-#: ../lib/protocols.c:869
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "The protocol '%s' is currently not supported.\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 "Looking up %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 "Cannot look up hostname %s: %s\n"
-
-#: ../lib/protocols.c:2091
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Found recursive symbolic link %s\n"
 
-#: ../lib/protocols.c:2379
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Failed to create a socket: %s\n"
-
-#: ../lib/protocols.c:2385
-#: ../lib/protocols.c:2491
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Trying %s:%d\n"
-
-#: ../lib/protocols.c:2390
-#: ../lib/protocols.c:2498
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Cannot connect to %s: %s\n"
-
-#: ../lib/protocols.c:2428
-#: ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Failed to create a IPv4 socket: %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 "Cannot look up service name %s/tcp. Please check your services file\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 "Error: Cannot set close on exec flag: %s\n"
-
-#: ../lib/protocols.c:2521
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Connected to %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 "Connection to %s timed out\n"
-
-#: ../lib/protocols.c:2904
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Cannot get socket flags: %s\n"
-
-#: ../lib/protocols.c:2918
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Cannot set socket to non-blocking: %s\n"
-
-#: ../lib/protocols.c:3064
+#: lib/protocols.c:1531
 #, 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:3072
+#: lib/protocols.c:1539
 #, 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"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Error: Cannot set close on exec flag: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Cannot open master pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Cannot create a socket pair: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error: Cannot execute ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Cannot fork another process: %s\n"
 
-#: ../lib/rfc2068.c:30
-#: ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy hostname:"
 
-#: ../lib/rfc2068.c:32
-#: ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Firewall hostname"
 
-#: ../lib/rfc2068.c:33
-#: ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy port:"
 
-#: ../lib/rfc2068.c:35
-#: ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port to connect to on the firewall"
 
-#: ../lib/rfc2068.c:36
-#: ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxy username:"
 
-#: ../lib/rfc2068.c:38
-#: ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Your firewall username"
 
-#: ../lib/rfc2068.c:39
-#: ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxy password:"
 
-#: ../lib/rfc2068.c:41
-#: ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Your firewall password"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Use HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Do you want to use HTTP/1.1 or 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"
@@ -948,442 +901,531 @@ msgstr ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\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 "Disconnecting from site %s\n"
 
-#: ../lib/rfc2068.c:304
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Starting the file transfer at offset "
 
-#: ../lib/rfc2068.c:325
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Cannot retrieve file %s\n"
 
-#: ../lib/rfc2068.c:424
-#: ../lib/sshv2.c:1301
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Retrieving directory listing...\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 "Received wrong response from server, disconnecting\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE command"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Custom"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Email address:"
 
-#: ../lib/rfc959.c:45
-msgid "This is the password that will be used whenever you log into a remote FTP server as anonymous"
-msgstr "This is the password that will be used whenever you log into a remote FTP server as anonymous"
+#: lib/rfc959.c:45
+msgid ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
+msgstr ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy account:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Your firewall account (optional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxy server type:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
-msgid "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement 
string prefixed by a % that will be replaced with the proper data. The first character can be either p for 
proxy or h for the 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 "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement 
string prefixed by a % that will be replaced with the proper data. The first character can be either p for 
proxy or h for the 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"
-
-#: ../lib/rfc959.c:69
+msgid ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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 ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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"
+
+#: 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 giving their internal rather then 
their external IP address in a PASV reply."
+#: 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 giving their internal rather then their external IP "
+"address in a PASV reply."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive file transfers"
 
-#: ../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. Generally, it is a good idea to keep this enabled unless 
you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open 
up a port on the client side and the remote server will attempt to connect to it."
-msgstr "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. Generally, it is a good idea to keep this enabled unless 
you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open 
up a port on the client side and the remote server will attempt to connect to it."
-
-#: ../lib/rfc959.c:79
+#: 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. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
+msgstr ""
+"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. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
+
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolve Remote Symlinks (LIST -L)"
 
-#: ../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 will want to disable this is if the remote FTP server doesn't 
support the -L option to LIST"
-msgstr "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 will want to disable this is if the remote FTP server doesn't 
support the -L option to LIST"
+#: 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 "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
+msgstr ""
+"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 "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transfer files in ASCII mode"
 
-#: ../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 text files. If you are transfering from UNIX to UNIX, 
then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
-msgstr "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 text files. If you are transfering from UNIX to UNIX, 
then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
+#: lib/rfc959.c:87
+#, fuzzy
+msgid ""
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
+"then you should enable this. Each system represents newlines differently for "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
+msgstr ""
+"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 "
+"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
 
-#: ../lib/rfc959.c:381
-#: ../lib/rfc959.c:390
-#: ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855
-#: ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Invalid response '%c' received from server.\n"
 
-#: ../lib/rfc959.c:745
-#: ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Failed to create a IPv4 socket: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, 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:781
+#: lib/rfc959.c:775
 #, 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:792
-#: ../lib/rfc959.c:953
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Cannot create a data connection: %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 "Cannot get socket name: %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 "Cannot bind a port: %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 "Cannot listen on port %d: %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Failed to create a IPv6 socket: %s\n"
 
-#: ../lib/rfc959.c:903
-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:895
+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:931
-#: ../lib/rfc959.c:940
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Invalid EPSV response '%s'\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Cannot get address of local socket: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Cannot accept connection from server: %s\n"
 
-#: ../lib/rfc959.c:1619
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1621
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Warning: Cannot parse listing %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Looking up %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 "Cannot look up hostname %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Failed to create a socket: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Trying %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 "Cannot connect to %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Connected to %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 "Cannot look up service name %s/tcp. Please check your services file\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Connection to %s timed out\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Cannot get socket flags: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Cannot set socket to non-blocking: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Prog Name:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "The path to the SSH executable"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH Extra Params:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Extra parameters to pass to the SSH program"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Need SSH User/Pass"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Require a username/password for SSH connections"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Running program %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Enter passphrase for RSA key"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Enter passphrase for key '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Password"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "password"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Enter PASSCODE:"
 
-#: ../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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Enter SecurID Password:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Error: An incorrect password was entered\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protocol Initialization\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protocol version %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Open %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Close\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Open Directory %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Read Directory\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Remove file %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Make directory %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Remove directory %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: File attributes\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690
-#: ../src/gtk/bookmarks.c:1042
-#: ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253
-#: ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995
-#: ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "No such file or directory"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Failure"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Bad message"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "No connection"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Connection lost"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operation unsupported"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Unknown message returned from server"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Error: Message size %d too big\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 "Error: Message size %d too big from server\n"
 
-#: ../lib/sshv2.c:817
-msgid "There was an error initializing a SSH connection with the remote server. The error message from the 
remote server follows:\n"
-msgstr "There was an error initialising a SSH connection with the remote server. The error message from the 
remote server follows:\n"
+#: lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
+msgstr ""
+"There was an error initialising a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
 
-#: ../lib/sshv2.c:1134
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Opening SSH connection to %s\n"
 
-#: ../lib/sshv2.c:1186
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Successfully logged into SSH server %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL Engine"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy File:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropy file"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy Seed Length:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "The maximum number of bytes to seed the SSL engine with"
 
-#: ../lib/sslcommon.c:41
-#: ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verify SSL Peer"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1396,137 +1438,134 @@ msgstr ""
 "Subject = %s\n"
 "Error %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Cannot get peer certificate\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 connected to (%s). 
Aborting connection.\n"
-msgstr "ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). 
Aborting connection.\n"
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
+msgstr ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Cannot initialise the OpenSSL library\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Error loading default SSL certificates\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Error setting cipher list (no valid ciphers)\n"
 
-#: ../lib/sslcommon.c:353
-#: ../lib/sslcommon.c:427
-#: ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Error: SSL engine was not initialised\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Error setting up SSL connection (BIO object)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Error setting up SSL connection (SSL object)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Error with peer certificate: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operation cancelled\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Waiting %d seconds until trying to connect again\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 ">. 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";
-
-#: ../src/uicommon/gftpui.c:158
-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 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"
+#: 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 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"
 
-#: ../src/uicommon/gftpui.c:160
-#: ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Translated by"
 
-#: ../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 "Error: Not connected to a remote site\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "usage: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "usage: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "usage: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "usage: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "usage: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "usage: 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 "usage: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Invalid argument\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Clear the directory cache\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "usage: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "usage: 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 "Error: Variable %s is not a valid configuration variable.\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 "Error: Variable %s is not available in the text port of gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1534,327 +1573,323 @@ msgstr ""
 "Supported commands:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "usage: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Shows gFTP information"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 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:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 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:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944
-#: ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Changes the remote working directory"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Changes the permissions of a remote file"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Available options: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Disconnects from the remote site"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Removes a remote file"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Shows the directory listing for the current remote directory"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Downloads remote file(s)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Shows this help screen"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Changes the local working directory"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Changes the permissions of a local file"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Removes a local file"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Shows the directory listing for the current local directory"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Creates a local directory"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Show current local directory"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Rename a local file"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Remove a local directory"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Creates a remote directory"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Uploads local file(s)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Opens a connection to a remote site"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Show current remote directory"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Exit from gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Rename a remote file"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Remove a remote directory"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-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:1002
+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:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Run a site specific command"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Error: Command not recognized\n"
 
-#: ../src/uicommon/gftpui.c:1334
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Successfully transferred %s at %.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 "Skipping file %s on host %s\n"
 
-#: ../src/uicommon/gftpui.c:1389
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Stopping the transfer on host %s\n"
 
-#: ../src/uicommon/gftpui.c:1540
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Could not download %s from %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 log for which items were 
not properly transferred."
-msgstr "There were %d files or directories that could not be transferred. Check the log for which items were 
not properly transferred."
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Please hit the stop button first to do anything else\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Run Bookmark"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Add Bookmark: You must enter a name for the bookmark\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
+msgstr ""
+"Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 
-#: ../src/gtk/bookmarks.c:135
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Add Bookmark"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Add Bookmark: You must enter a hostname\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1864,31 +1899,31 @@ msgstr ""
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Remember password"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "You must specify a name for the bookmark."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "New Folder"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Enter the name of the new folder to create"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "New Item"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Enter the name of the new item to create"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1897,113 +1932,99 @@ msgstr ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Delete Bookmark"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../src/gtk/bookmarks.c:849
-#: ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Edit Entry"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Remote Directory:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Local Directory:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Username:"
 
-#: ../src/gtk/bookmarks.c:1000
-#: ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Account:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Log in as ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053
-#: ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265
-#: ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216
-#: ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancel  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/File/New _Folder..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/New _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/File/_Delete"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/File/_Properties..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Close"
 
-#: ../src/gtk/bookmarks.c:1229
-#: ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edit Bookmarks"
 
-#: ../src/gtk/chmod_dialog.c:132
-#: ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2011,101 +2032,90 @@ msgstr ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Special"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192
-#: ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "User"
 
-#: ../src/gtk/chmod_dialog.c:200
-#: ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Read"
 
-#: ../src/gtk/chmod_dialog.c:204
-#: ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Write"
 
-#: ../src/gtk/chmod_dialog.c:208
-#: ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Execute"
 
-#: ../src/gtk/chmod_dialog.c:212
-#: ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Group"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Other"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Are you sure you want to delete these %ld files and %ld directories"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Are you sure you want to delete these %ld files"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Are you sure you want to delete these %ld directories"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Delete Files/Directories"
 
-#: ../src/gtk/delete_dialog.c:90
-#: ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/gtk/dnd.c:123
-#: ../src/gtk/gftp-gtk.c:1097
-#: ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connect"
 
-#: ../src/gtk/dnd.c:136
-#: ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Received URL %s\n"
 
-#: ../src/gtk/dnd.c:159
-#: ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Drag-N-Drop"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Exit"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2113,487 +2123,455 @@ msgstr ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 
-#: ../src/gtk/gftp-gtk.c:219
-#: ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Open Location"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Enter a URL to connect to"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Window _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Window _2"
 
-#: ../src/gtk/gftp-gtk.c:271
-#: ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binary"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferences..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Quit"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:286
-#: ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_View..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remote"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remote/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remote/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:314
-#: ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remote/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remote/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remote/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remote/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remote/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remote/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remote/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remote/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remote/_Permisssions..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remote/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remote/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remote/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remote/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remote/_View..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remote/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bookmarks/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bookmarks/Add _Bookmark"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bookmarks/Edit Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bookmarks/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transfer"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transfer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transfer/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transfer/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346
-#: ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transfer/Skip _Current File"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transfer/_Remove File"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transfer/Move File _Up"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transfer/Move File _Down"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfer/_Retrieve Files"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transfer/_Put Files"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Clear"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_View"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Save..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Tool_s"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tools/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/C_ompare Windows"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Tools/_Clear Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Help"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Host: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Host: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "User: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_User: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Pass: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Command: "
 
-#: ../src/gtk/gftp-gtk.c:778
-#: ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Filename"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Size"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Date"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attribs"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Error: You must type in a host to connect to\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Refresh"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Enter Username"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Please enter your username for this site"
 
-#: ../src/gtk/gtkui.c:143
-#: ../src/gtk/transfer.c:586
-#: ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Please enter your password for this site"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operation cancelled...you must enter a string\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Make Directory"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Enter name of directory to create"
 
-#: ../src/gtk/gtkui.c:370
-#: ../src/gtk/gtkui.c:382
-#: ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rename"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "What would you like to rename %s to?"
 
-#: ../src/gtk/gtkui.c:402
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Enter site-specific command"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Prepend with SITE"
 
-#: ../src/gtk/gtkui.c:449
-#: ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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 "Skipped"
 
-#: ../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 "Waiting..."
 
-#: ../src/gtk/gtkui_transfer.c:136
-#: ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../src/gtk/gtkui_transfer.c:143
-#: ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Resume"
 
-#: ../src/gtk/gtkui_transfer.c:150
-#: ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Skip"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Action"
 
-#: ../src/gtk/gtkui_transfer.c:236
-#: ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transfer Files"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2601,74 +2579,72 @@ msgstr ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Skip File"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Select All"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselect All"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "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:83
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Change Filespec"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Enter the new file specification"
 
-#: ../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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Error: Cannot open %s for writing: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Save Directory Listing"
 
-#: ../src/gtk/menu-items.c:327
-#: ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Error: Error writing to %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Successfully wrote the log file to %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Save Log"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
-msgid "Cannot find the license agreement file COPYING. Please make sure it is in either %s or in %s"
-msgstr "Cannot find the licence agreement file COPYING. Please make sure it is in either %s or in %s"
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
+msgstr ""
+"Cannot find the licence agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
 
-#: ../src/gtk/menu-items.c:454
-#: ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "About gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2679,99 +2655,80 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "About"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../src/gtk/menu-items.c:558
-#: ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  Close  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compare Windows"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Disconnect from the remote server"
 
-#: ../src/gtk/misc-gtk.c:261
-msgid "Connect to the site specified in the host entry. If the host entry is blank, then a dialog is 
presented that will allow you to enter a URL."
-msgstr "Connect to the site specified in the host entry. If the host entry is blank, then a dialogue is 
presented that will allow you to enter a URL."
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialogue is presented that will allow you to enter a URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "All Files"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Error opening file %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Not connected to a remote site\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: This feature is not available using this protocol\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: You must only have one item selected\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: You must have at least one item selected\n"
 
-#: ../src/gtk/misc-gtk.c:926
-#: ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Change"
 
-#: ../src/gtk/misc-gtk.c:998
-#: ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Add"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Yes  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  No  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Getting directory listings"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2780,114 +2737,89 @@ msgstr ""
 "Received %ld directories\n"
 "and %ld files"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Error: Cannot find file %s in %s or %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Edit Host"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Add Host"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Type:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/gtk/options_dialog.c:1014
-#: ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domain"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Network Address"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Network address:"
 
-#: ../src/gtk/options_dialog.c:1088
-#: ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etmask:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domain:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netmask"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Local Hosts"
 
-#: ../src/gtk/options_dialog.c:1288
-#: ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Edit"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../src/gtk/options_dialog.c:1367
-#: ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Options"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Apply"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Receiving file names..."
 
-#: ../src/gtk/transfer.c:63
-#: ../src/gtk/transfer.c:712
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Retrieve Files: Not connected to a remote site\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Error: Child %d returned %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Child %d returned successfully\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Error: Child %d did not terminate properly\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Error: Cannot get information about file %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "File %s was not changed\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2896,145 +2828,207 @@ msgstr ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Edit File"
 
-#: ../src/gtk/transfer.c:499
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Finished"
 
-#: ../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 "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 
-#: ../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 "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 
-#: ../src/gtk/transfer.c:773
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Sent %s of %s, transfer stalled, unknown time remaining"
 
-#: ../src/gtk/transfer.c:779
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s, transfer stalled, unknown time remaining"
 
-#: ../src/gtk/transfer.c:823
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Unknown percentage complete. (File %ld of %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%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Retrieving file names...%s bytes"
 
-#: ../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 "There are no file transfers selected\n"
 
-#: ../src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "View"
 
-#: ../src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edit"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "View: %s is a directory. Cannot view it.\n"
 
-#: ../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 dialogue\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 "Edit: %s is a directory. Cannot edit it.\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 "Edit: You must specify an editor in the options dialogue\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "View: Cannot fork another process: %s\n"
 
-#: ../src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Running program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:272
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Opening %s with %s\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viewing file %s\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "View: Cannot open file %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Cannot open controlling terminal %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Username [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%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 ""
+#~ ">. 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";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancel  "
+
+#~ msgid "Host: "
+#~ msgstr "Host: "
+
+#~ msgid "User: "
+#~ msgstr "User: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Close  "
+
+#~ msgid "Add"
+#~ msgstr "Add"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Yes  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Network Address"
+#~ msgstr "Network Address"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Apply"
+#~ msgstr "Apply"
 
 #~ 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"
+
 #~ 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"
+
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr "Error: Remote site disconnected after trying to transfer file\n"
+
 #~ msgid "There was an error transfering the file %s"
 #~ msgstr "There was an error transfering the file %s"
+
 #~ msgid "Stopping the transfer of %s\n"
 #~ msgstr "Stopping the transfer of %s\n"
+
 #~ msgid "Startup Directory:"
 #~ msgstr "Startup Directory:"
+
 #~ msgid "The default directory gFTP will go to on startup"
 #~ msgstr "The default directory gFTP will go to on startup"
+
 #~ msgid "Connect via URL"
 #~ msgstr "Connect via URL"
+
 #~ msgid "OpenURL"
 #~ msgstr "OpenURL"
+
 #~ msgid "/FTP/_Options..."
 #~ msgstr "/FTP/_Options..."
+
 #~ msgid "/Local/Make Directory..."
 #~ msgstr "/Local/Make Directory..."
+
 #~ msgid "/Remote/Make Directory..."
 #~ msgstr "/Remote/Make Directory..."
+
 #~ msgid "/Transfers/Start Transfer"
 #~ msgstr "/Transfers/Start Transfer"
+
 #~ msgid "/Transfers/Stop Transfer"
 #~ msgstr "/Transfers/Stop Transfer"
-
diff --git a/po/eo.po b/po/eo.po
index cacd748..e4ae5c5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,13 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-eo-20070616\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-05 23:06+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-04-25 16:17+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <ubuntu-l10n-eo lists launchpad net>\n"
-"Language: \n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,87 +21,86 @@ msgstr ""
 "X-Generator: Launchpad (build 12915)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Nevalida URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Eraro: Nevalida linio %s en kaŝmemora indeksdosiero\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Eraro: Ne povas krei la dosierujon %s : %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Eraro : Ne povas krei portempan dosieron : %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Eraro dum la fermado de dosiera priskribilo : %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Eraro: ne eblas serĉi en dosiero %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "Eraro dum  konvertado de ĉeno '%s' el signaro %s al signaro %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Eraro: Ne eblas malfermi la lokan dosieron %s : %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Eraro: Ne povas skribi al kontaktilo : %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Eraro: Ne povas legi el kontaktilo : %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Eraro: Nevalida nomo por legosigna dosiero %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Averto: Ne eblas trovi ĉefan legosignan dosieron %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Eraro de gFTP : Ne eblas malfermi legosignan dosieron %s : %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Averto de gFTP: Ignoranta la %d-a linion en legosigna dosiero : %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Averto de gFTP: %d-a linio ne havas sufiĉajn argumentojn\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -112,7 +110,7 @@ msgstr ""
 "kaj ne devas iri al prokurilo (se havebla). Sintakso: dont_use_proxy=."
 "domajno aŭ dont_use_proxy=retnumero/retmasko"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -120,52 +118,52 @@ msgstr ""
 "ext=dosiersufikso:XPM file:ASCII aŭ Binary (Duuma) (A aŭ B). Notu: Ĉiuj "
 "argumentoj krom la sufikso estas nedevigaj"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Eraro de gFTP: Nevalida dosiernomo por agorda dosiero %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Eraro de gFTP: Ne eblis krei dosierujon %s : %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Eraro de gFTP: Ne eblas trovi ĉefan agordan dosieron %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ĉu vi rulis \"make install\"?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Eraro de gFTP: Ne eblas malfermi agorddosieron %s : %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Ĉesanta pro analizaj eraroj ĉe %d-a linio en la agorda dosiero\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Averto de gFTP: Ignoranta %d-an linion en agorddosiero : %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Eraro de gFTP: Nevalida protokola dosiernomo %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Averto de gFTP: %s estas nemalfermebla por skribi : %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -173,7 +171,7 @@ msgstr ""
 "Legosigna dosiero por gFTP. Kopirajto (C) 1998-2007 Brian MASNEY "
 "<masneyb gftp org>. Averto: komentoj enigitaj de vi estos anstataŭigitaj."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -185,7 +183,7 @@ msgstr ""
 "staranta apud vi dum vi redaktas ĉi tiun dosieron. Antaŭe, ĉiuj pasvortoj "
 "estis en ordinara teksto."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -195,95 +193,94 @@ msgstr ""
 "org>. Averto: eventualaj komentoj enigitaj de vi estos anstataŭigitaj. Se "
 "elemento havas la signon (*) en ĝia komento, vi ne povas ŝanĝi ĝin en gFTP."
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nekonata>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "NERIPAREBLA gFTP-Eraro : Agorda elemento '%s' ne troviĝas en hakettabelo\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Eraro : Ne eblas alŝuti dosieron %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Eraro : Ne eblas skribi en dosiero %s : %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Eraro : Eraris fermi dosieron : %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Difektita dosiera listo el FSP-servilo %s\n"
 
-#: ../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
+#: 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 "nekonata"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Ne eblis akiri FSP-dosierujan liston %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Sukcesis ŝanĝi dosierujon al %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Ne eblis ŝanĝi dosierujon al %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Sukcese forigita %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Eraro: Ne eblis forigi dosierujon %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Eraro: Ne eblis forigi dosieron %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Sukcese kreis dosierujon %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Sukcese renomis de %s al %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Eraro : Ne eblas renomi je %s al %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -291,7 +288,7 @@ msgstr ""
 "FTPS-subteno ne disponeblas ĉar SSL-subteno ne estas enkompilita. Kontekto "
 "ĉesas.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -299,107 +296,105 @@ msgstr ""
 "HTTPS-subteno ne disponeblas ĉar SSL-subteno ne estas enkompilita. Konekto "
 "ĉesas.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Ne eblis akiri aktualan dosierujon: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Sukcese ŝanĝis la lokan dosierujon al %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Ne eblas ŝanĝi lokan dosierujon al %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Eraro: Ne eblis stumpigi lokan dosieron %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Ne eblis akiri liston de loka dosierujo %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Sukcese ŝanĝis reĝimon de %s al %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Eraro: Ne eblis ŝanĝi reĝimon de %s al %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Sukcese ŝanĝis la tempindikon %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Eraro: ne povis ŝanĝi la tempindikon %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "loka dosiersistemo"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uzmaniero: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nenio"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "dosiero"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "grando"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "uzanto"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datohoro"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributoj"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "malkreskante"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "kreskante"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Ĝenerale"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Vidi programon:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -407,28 +402,28 @@ msgstr ""
 "La defaŭlta programo uzota por legi dosierojn. Se ĝi estas malplena, la "
 "interna dosiervidigilo uzatos"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Redakta programo:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "La defaŭlta programo uzota por redakti dosierojn."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maks Grando de Protokola Fenestro:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "La maksimuma grando en bajtoj de la protokola fenestro por la GTK+adapto"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Foraj Signaroj:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -436,11 +431,11 @@ msgstr ""
 "Ĉi tiu estas apartigita de komoj listo de signaroj por provi konverti la "
 "forajn mesaĝojn por la aktuala lokaĵaro"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Fora LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -448,187 +443,191 @@ msgstr ""
 "Jen la valoro de LC_TIME por la fora retejo. Tio estas por ĝuste analizi la "
 "datojn en la dosieruja listo."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Kaŝmemora TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "La tempo en sekundoj konservi la kaŝmemorajn elementojn antaŭ ol ili finiĝas."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Postglui dosierajn transigojn"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Postglui novajn dosierajn transigojn al ekzistantaj"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Transigi unuope"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Ĉu transigi unuope?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Anstataŭigi Defaŭlte"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Anstataŭigi dosierojn defaŭlte aŭ agordi por restartigi dosierajn transigojn"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Konservi dosierajn atingopermesojn"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Konservi dosierajn atingopermesojn de transigitaj dosieroj"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Konservi dosieran horon"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Konservi dosieran horon de transigitaj dosieroj"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Aktualigi post ĉiu dosiera transigo"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Aktualigi la falliston post transigo de ĉiu dosiero"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Unue ordigi la dosierujojn"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Unue ordigi la dosierujojn, poste la dosierojn"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Montri kaŝitajn dosierojn"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Vidigi kaŝitajn dosierojn en la fallistoj"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Vidigi transigan staton en la titolo"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Vidigi la transigan staton de dosieroj en la titolbreto"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Startigi  transigi dosierojn"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Aŭtomate startigi transigi la dosierajn kiam ili estas envicigitaj"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permesi tajpi komandojn en GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "Permesi tajpi komandojn en la GUI (funkciojn kiel adapti tekston)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Memori lastan dosierujon"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Konservi la lastan lokan kaj foran dosierujojn kiam la aplikaĵo fermiĝos."
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Konekti foran servilon je startigo"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Aŭtomate konekti la foran servilon kiam oni startigas la aplikaĵon."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Reto"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Reta tempolimo:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "La tempolimo por atendi retan enigon/eligon. Tiu NE estas senokupa tempolimo."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Konektaj reprovoj:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "La nombro da aŭtomataj reprovoj farotaj. Ŝaltu ĝin al 0 por reprovi senfine"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Reprova dormotempo:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "La nombro da sekundoj atendi inter reprovoj"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maks KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "La maksimuma KB/s atingebla de dosiera transigo. (Atribuu al 0 por malŝalti)."
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Grando de Transiga Bloko:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "La bloka grando uzota transigante dosierojn. Tiu estu oblo de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Defaŭlta Protokolo:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Tiu specifas la defaŭltan protokolon uzotan"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Ŝalti subtenon de IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -636,27 +635,27 @@ msgstr ""
 "Tiu difinas tion, kio okazos kiam oni duoble alklakas al dosiero en la "
 "dosiera fallisto. 0=Vidigi dosieron 1=Redakti dosieron 2=Transigi dosieron"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "La defaŭlta larĝo de la fallisto de lokaj dosieroj"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "La defaŭlta larĝo de la fallisto de foraj dosieroj"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "La defaŭlta alto de la fallisto de lokaj/foraj dosieroj"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "La defaŭlta alto de la transiga fallisto"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "La defaŭlta alto de la protokola fenestro"
 
-#: ../lib/options.h:177
+#: 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."
@@ -664,15 +663,15 @@ msgstr ""
 "La larĝo de la dosiernoma kolumno en la transiga fenestro. Atribuu ĝin al 0 "
 "por aŭtomate regrandigi ĉi tiun kolumnon."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "La defaŭlta kolumno laŭ kiu ordigi"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordigi kreskante aŭ malkreskante"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -681,7 +680,7 @@ msgstr ""
 "aŭtomate regrandigi ĉi tiun kolumnon. Atribuu ĝin al -1 por malŝalti la "
 "kolumnon"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -690,7 +689,7 @@ msgstr ""
 "por aŭtomate grandigi la kolumnon. Atribuu ĝin al -1 por malŝalti la "
 "kolumnon."
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -698,7 +697,7 @@ msgstr ""
 "La larĝo de la uzula kolumno en la dosieraj fallistoj. Atribuu ĝin al 0 por "
 "aŭtomate grandigi la kolumnon. Atribuu ĝin al -1 por malŝalti la kolumnon."
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -706,7 +705,7 @@ msgstr ""
 "La larĝo de la grupa kolumno en la dosieraj fallistoj. Atribuu ĝin al 0 por "
 "aŭtomate grandigi la kolumnon. Atribuu ĝin al -1 por malŝalti la kolumnon."
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -714,7 +713,7 @@ msgstr ""
 "La larĝo de la data kolumno en la dosieraj fallistoj. Atribuu ĝin al 0 por "
 "aŭtomate grandigi la kolumnon. Atribuu ĝin al -1 por malŝalti la kolumnon."
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -723,75 +722,75 @@ msgstr ""
 "por aŭtomate grandigi la kolumnon. Atribuu ĝin al -1 por malŝalti la "
 "kolumnon."
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "La koloro de la komandoj sendotaj al la servilo"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "La koloro de la komandoj ricevotaj el la servilo"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "La koloro de la prieraraj mesaĝoj"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "La koloro de la aliaj protokolaj mesaĝoj"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Loka"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Legosigno"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Dosieraj transigoj estos limigitaj al %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Eraro okazis atribuante je LC_TIME al '%s'. Sin turnas al '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Ŝargante dosierujan liston %s el kaŝmemoro (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Ŝargante dosierujan liston %s el servilo (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -800,109 +799,109 @@ msgstr ""
 "Averto: forstucis la vojprefikson de la dosiero '%s'. La stucita vojprefikso "
 "(%s) ne kongruas kun la aktuala dosierujo (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Eraro: Ne eblas skribi al kaŝmemoro: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Eraro: Ne eblas trovi legosignon %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Legosigna Eraro: La legosigna elemento %s ne havas gastigilan nomon\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "La protokolo '%s' nuntempe ne estas subtenata.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Trovis rikuran simbolan ligilon %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Eraro: Fora retejo %s malkonektita. Maksimumaj reprovoj superitaj... ĉesis\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Eraro: Fora retejo %s malkonektita. Rekontektos en %d sekundoj\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Eraro: Ne povas atribui fermon je flago exec: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Ne eblas malfermi ĉefan pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Ne eblas krei kontaktoskatolan paron: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Eraro: Ne eblas ruli je ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Ne eblas spliti alian procedon: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Prokura gastignomo:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Gastignomo de fajroŝirmilo"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Prokura pordo:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Pordo al kiu konekti ĉe la fajroŝirmilo"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Prokura uzulonomo:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Nomo de via fajroŝirmilo"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Prokura pasvorto:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Via fajroŝirmila pasvorto"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Uziĝu HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Ĉu uziĝu HTTP/1.1 aŭ HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -911,84 +910,84 @@ msgstr ""
 "Ricevis malĝustan respondon de servilo; malkonektas\n"
 "Nevalida blokgrando '%s' liverita de la fora servilo\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Malkonektas de fora retejo %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Startigo de dosiera transigo ĉe deŝovo "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Ne eblas legi dosieron %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Legante liston de dosierujoj...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Ricevis malĝustan respondon de servilo; malkonektas\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Komando SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "uzanto gastigilo"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "uzulo gastigilo:pordo"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AŬTENTIGI"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "uzanto gastiga pordo"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "uzanto host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP-Prokuro"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Propra"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Retpoŝta adreso:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 "Tiu estas la pasvorto uzota kiam vi salutas anonime al fora FTP-servilo"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Prokura konto:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Via fajroŝirmila konto (maldeviga)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo de prokura servilo:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1005,11 +1004,11 @@ msgstr ""
 "o (pordo) aŭ a (konto). Ekzemple, por specifi la prokuran uzulon, oni povas "
 "tajpi %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Malatenti PASV-adreson"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1021,11 +1020,11 @@ msgstr ""
 "necesas por enkursigiloj donantaj sian internan anstataŭ sian eksteran "
 "adreson en PASV-respondo."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasivaj dosiertransigoj"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1041,11 +1040,11 @@ msgstr ""
 "malfermos pordon ĉe la klienta flanko kaj la fora servilo provos konekti al "
 "ĝi."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Solvi Forajn Simligojn (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1056,15 +1055,16 @@ msgstr ""
 "estas bona ideo lasi ĝin ŝaltita. La sola okazo kiam oni malŝaltu ĝin estas "
 "se la fora FTP-servilo ne subtenas la argumenton -L por LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transigi dosierojn en modo ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1073,332 +1073,323 @@ msgstr ""
 "tekstaj dosieroj. Se oni transigas dosierojn de Unikso al Unikso, estas "
 "sendanĝere ellasi tion. Se oni transigas duumajn datumojn, oni malŝaltu ĝin."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ricevis nevalidan respondon '%c' de la servilo.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Malsukcesis krei IPv4-kontaktoskatolon: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Ne eblas trovi IP-adreson en PASV-respondo '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Malatentas IP-adreson en PASV-respondo, konektas al %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Ne eblas krei datuman konekton: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Ne eblas trovi kontaktoskatolan nomon: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Ne eblas bindi pordon: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Ne eblas aŭskulti ĉe pordo %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Malsukcesis krei IPv6-kontaktoskatolon: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Eraro: Ŝajne ne konektita per IPv6. Ĉesis konekton.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Nevalida EPSV-respondo '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Ne eblas trovi adreson de loka kontaktoskatolo: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Ne eblas akcepti konekton el servilo: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "sumo"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Averto: Ne eblas analizi liston %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Serĉante je %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Ne eblas serĉi gastigilan nomon %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Malsukcesis krei kontaktoskatolon: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Provante je %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Ne eblas konekti al %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Konektita al %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Ne povas trovi serviconomon %s/tcp. Bonvolu kontroli vian servan dosieron\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Konekto al %s pasis tempolimon\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Ne eblas akiri kontaktoskatolon: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Ne eblas atribui kontaktoskatolon al nebloka: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nomo de SSH-programo:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "La vojo al la rulebla SSH-programo"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Ekstraj Parametroj por SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Ekstraj parametroj por doni al la SSH-programo"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Bezonataj Uzulo/Pasv SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Bezonataj estas uzulnomo/pasvorto por SSH-konektoj"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Rulas programon %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Tajpi pasfrazon por RSA-ŝlosilo"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Tajpi pasfrazon por ŝlosilo '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "pasvorto"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(jes/ne)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Tajpi je PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Enigu Pasvorton"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Tajpi Pasvorton SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Eraro: Malĝusta pasvorto tajpita\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Pravalorizi Protokolon\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versio de Protokolo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Malfermi je %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Fermi\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d\" Malfermi Dosierujon %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Legi Dosierujon\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Forigi dosieron %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Krei dosierujon %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Forigi dosierujon %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Vera vojo %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Dosieraj atributoj\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Akcepti"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ne ekzistas tia dosiero aŭ dosierujo"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Malpermesita"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Malsukceso"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Maltaŭga mesaĝo"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Mankas konekto"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Konekto interrompiĝis"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operacio nesubtenata"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Nekonata mesaĝo ricevita el servilo"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Eraro: Mesaĝa grando %d tro granda\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Eraro: Mesaĝa grando %d tro granda el servilo\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1406,41 +1397,41 @@ msgstr ""
 "Eraro okazis dum pravalorizado de SSH-konekto al la fora servilo. Jen la "
 "mesaĝo el la fora servilo:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Malfermas SSH-konekton al %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Sukcese konektis al SSH-servilo %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL Motoro"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL-Entropia Dosiero:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL-entropia dosiero"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Longo de Entropia Semo:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "La maksimuma nombro da bajtoj por semi la SSL-motoron"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Konfirmi la SSL-Samtavolanon"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1453,11 +1444,11 @@ msgstr ""
 "Temo: %s\n"
 "Eraro %i: %s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Ne eblas trovi samtavolanan atestilon\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1466,45 +1457,45 @@ msgstr ""
 "ERARO: La gastigilo en la SSL-atestilo (%s) ne kongruas kun la gastigilo al "
 "kiu ni konektis (%s). Ĉesas konekto.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Ne eblas pravalorizi la bibliotekon de OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Eraro ŝargi defaŭltajn SSL-atestilojn\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Eraro agordi ĉifroliston (mankas validaj ĉifroj)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Eraro: SSL-motoro ne pravalorizita\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Eraro starigi SSL-konekton (BIO-objekton)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Eraro starigi SSL-konekton (SSL-objekton)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Eraro pri samtavolana atestilo: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operacio nuligita\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Atendas %d sekundojn ĝis reprovi konekti\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1515,73 +1506,73 @@ msgstr ""
 "redisdoni ĝin laŭ difinitaj kondiĉoj; por detaloj vidu la dosieron pri "
 "KOPIADO.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Tradukis"
 
-#: ../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
+#: 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 "Eraro: Ne konektita al fora retejo\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "uzmaniero: chmod <reĝimo> <dosiero>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "uzmaniero: rename <malnova nomo> <nova nomo>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "uzmaniero: delete <dosiero>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "uzmaniero: rmdir <dosierujo>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uzmaniero: site <reteja komando>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "uzmaniero: mkdir <nova dosierujo>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "uzmaniero: chdir <dosierujo>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Nevalida argumento\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Vakigi la dosierujan kaŝmemoron\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uzmaniero: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "uzmaniero: set [variablo = valoro]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Eraro: Variablo %s ne estas valida agorda variablo.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Eraro: Variablo %s ne estas havebla en la teksta pordo de gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1589,287 +1580,287 @@ msgstr ""
 "Subtenataj komandoj:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uzmaniero: %s <dosiero>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "pri"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Vidigas informon pri gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Ŝaltas la aktualan dosiertransigan modon al ASCII (nur por FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "duuma"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Ŝaltas la aktualan dosiertransigan reĝimon al Duuma (nur por FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Ŝanĝas la foran kurantan dosierujon"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Ŝanĝas la permesojn de fora dosiero"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "vakigi"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Disponeblaj agordoj: kaŝmemoro"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "fermi"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Malkonektas de la fora retejo"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "forigi"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Forigas foran dosieron"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Vidigas la dosierliston por la aktuala fora dosierujo"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Alŝutas forajn dosiero(j)n"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "helpo"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Vidigas ĉi tiun helpan ekranon"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Ŝanĝas la lokan kurantan dosierujon"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Ŝanĝas la permesojn de loka dosiero"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Forigas lokan dosieron"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Vidigas la dosierujan liston de la loka dosierujo"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Kreas lokan dosierujon"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Vidigi aktualan lokan dosierujon"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renomas lokan dosieron"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Forigi lokan doserujon"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Kreas foran dosierujon"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Alŝutas lokajn dosierojn"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Malfermas konekton al fora retejo"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Vidigi aktualan foran dosierujon"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "fini"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Eliri el gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renomi foran dosieron"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Forigi foran dosierujon"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Vidigi agordajn dosierajn variablojn. Oni povas agordi variablojn per set "
 "var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Ruligi retejo-specifan komandon"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Eraro: nekonata komando\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Sukcese transigis %s je %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Ignoras dosieron %s ĉe gastigilo %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Haltas la tarnsigon ĉe gastigilo %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Ne eblis elŝuti %s el %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1878,36 +1869,35 @@ msgstr ""
 "Trovis %d dosierojn aŭ dosierujojn kiuj ne estas transigeblaj. Kontrolu la "
 "protokolon por tiuj eroj kiuj ne estas ĝuste transigitaj."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Bonvolu alklaki la haltoklavon antaŭ ol fari ion alian\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Ruli Legosignon"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Aldoni Legosignon: Necesas tajpi nomon por la legosigno\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Aldoni Legosignon: Ne eblas aldoni legosignon %s ĉar tiu nomo jam ekzistas\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Aldonu al legosignoj"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Aldoni Legosignon: Necesas tajpi gastigilan nomon\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1917,31 +1907,31 @@ msgstr ""
 "Vi povas apartigi elementojn per / por meti ilin en submenuon\n"
 "(ekz: Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Memori pasvorton"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Vi devas agordi nomon por la legosigno."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nova Dosierujo"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Tajpi la nomon de la nova dosierujo kreota"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nova ero"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Tajpi la nomon de la nova elemento kreota"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1950,106 +1940,99 @@ msgstr ""
 "Ĉu vi certas forigi la legosignon\n"
 "%s kaj ĉiujn ties idojn?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Forigu legosignon"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Legosignoj"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Redakti Elementon"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Pordo:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Fora Dosierujo:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Loka Dosierujo:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Uzantnomo:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Saluti ANONIME"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Rezigni  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Dosiero"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Dosiero/forŝiri"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Dosiero/Nova dosierujo..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Dosiero/Nova ero..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Dosiero/Forigi"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Dosiero/Atributoj..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Dosiero/disigilo"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Dosiero/Fermi"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Redakti Legosignojn"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2057,91 +2040,90 @@ msgstr ""
 "Vi povas nun agordi la atributojn de viaj dosiero(j)\n"
 "Notu: Ne ĉiuj serviloj subtenas la trajton chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciala"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Fiksite"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Uzanto"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Legi"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Skribi"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Ruli"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Alia"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Ĉu vi certe volas forigi tiujn %ld dosierojn kaj %ld dosierujojn"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Ĉu vi certe volas forigi tiujn %ld dosierojn"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Ĉu vi certe volas forigi tiujn %ld dosierujojn"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Forigi Dosierojn/Dosierujojn"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Konekti"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Ricevita URL-o %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Ŝovi kaj Demeti"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Eliri"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2149,468 +2131,455 @@ msgstr ""
 "Dosieraj transigoj estas okazantaj.\n"
 "Ĉu vi certe volas eliri?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Malfermu lokon"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Tajpi je URL por konekti al"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/forŝiri"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Fenestro 1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Fenestro 2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/disigilo"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/Duuma"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/Agordoj..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Eliri"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/Loka"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Loka/forŝiri"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Loka/Malfermi je URL..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Loka/Malkonekti"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Loka/disigilo"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Loka/Modifi dosierspecifon..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Loka/Vidigi elektitajn"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Loka/Elekti ĉiujn"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Loka/Elekti Ĉiujn Dosierojn"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Loka/Malelekti Ĉiujn"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Loka/Konservi Liston de Dosierujo..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Loka/Sendi Komandon SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Loka/Ŝanĝi dosierujon"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Loka/Permesoj..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Loka/Krei dosierujon..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Loka/Renomi..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Loka/Forigi..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Loka/Redakti..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Loka/Vidigi..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Loka/Refreŝigi"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/Fora"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Fora/ŝiri"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Fora/Malfermi je URL..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Fora/Malkonekti"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Fora/disigilo"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Fora/Ŝanĝi dosierspecifon..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Fora/Vidigi elektitajn"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Fora/Elekti ĉiujn"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Fora/Elekti Ĉiujn Dosierojn"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Fora/Malelekti Ĉiujn"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Fora/Konservi Liston de Dosierujo..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Fora/Sendi Komandon SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Loka/Ŝanĝi dosierujon"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Fora/Permesoj..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Fora/Krei dosierujon..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Fora/Renomi..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Fora/Forigi..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Fora/Redakti..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Fora/Vidigi..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Fora/Refreŝigi"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Legosignoj"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Legosignoj/ŝiri"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Legosignoj/Krei legosignon"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Legosignoj/Redakti legosignojn"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Legosignoj/disigilo"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/Transigoj"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transigoj/Movebla menuo"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transigoj/Startigi transigon"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transigoj/Haltigi transigon"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transigoj/Ignori aktualan dosieron"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transigoj/Forigi dosieron"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transigoj/Suprenigi dosieron"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transigoj/Malsuprenigi dosieron"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transigoj/Trovi dosierojn"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transigoj/Meti dosierojn"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Protokolado"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Protokolado/Movebla menuo"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Protokolado/Vakigi"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Protokolado/Vidigi protokolon"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Protokolado/Konservi protokolon"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Iloj"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Iloj/Ŝiri"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Iloj/Kompari fenestrojn"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Iloj/Vakigi kaŝmemoron"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Helpo"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Helpo/Ŝiri"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Helpo/Pri"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Gastigilo: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "Gastigilo: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Pordo: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Uzulo: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "Uzulo: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Pasi: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Grando"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dato"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributoj"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Eraro: Necesas tajpi gastigilon al kiu konekti\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Aktualigi"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Tajpi Uzulonomon"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Bonvolu tajpi vian uzulonomon por ĉi tiu retejo"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Bonvolu tajpi vian pasvorton por ĉi tiu retejo"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operacio nuligita..vi tajpu ĉenon\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Fari Dosierujon"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Tajpi nomon de dosierujo kreota"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renomi"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Al kio vi volas renomi je %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Retejo"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Tajpi retejospecifan komandon"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Antaŭglui je SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Ignoris"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Atendas..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Anstataŭigu"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Pluruli"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Ignori"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Ago"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transigi Dosierojn"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2618,59 +2587,59 @@ msgstr ""
 "La jenaj dosieroj ekzistas ĉe kaj la loka kaj la fora komputilo\n"
 "Bonvolu elekti la farotan agon"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Ignori Dosieron"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Elekti Cxion"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Malelekti Ĉion"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Ŝanĝi dosieran atributon: Operacio nuligita...necesas tajpi ĉenon\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Ŝanĝi dosieran atributon"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Tajpu novan dosieran atributon"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Eraro: Ne eblas malfermi je %s por skribi: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Konservi Dosieran Liston"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Eraro: Eraro skribanta al %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Sukcese skribis protokolon al %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Konservi Protokolon"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2679,11 +2648,11 @@ msgstr ""
 "Ne trovis la licencan dosieron KOPIADO. Bonvolu certigi ke ĝi estas en aŭ %s "
 "aŭ %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Pri gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2694,27 +2663,23 @@ msgstr ""
 "Kopirajto (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Oficiala Hejmpaĝo: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Pri"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licenckontrakto"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Fermi  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Kompari Fenestrojn"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Malkonekti de la fora servilo"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2722,72 +2687,56 @@ msgstr ""
 "Konekti al la retejo specifita en la gastigila elemento. Se tiu elemento "
 "estas vaka, vidiĝos dialogo per kiu vi povas tajpi je URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "[ (Kaŝmemoro) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Ne konektita"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Eraro malfermi dosieron %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Ne konektita al fora retejo\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Tiu trajto ne disponeblas per ĉi tiu protokolo\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Necesas ke vi elektu nur unu eron\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Necesas ke vi elektu almenaŭ unu eron\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Aldoni"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Rezigni"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Jes  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Ne  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Trovas liston de dosierujoj"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Halti  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2796,217 +2745,200 @@ msgstr ""
 "Ricevis %ld dosierujojn\n"
 "kaj %ld dosierojn"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-Eraro: Ne eblas trovi dosieron %s en %s aŭ %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Redakti Gastigilon"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Aldoni Gastigilon"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domajno"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Reta Adreso"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Reta Adreso:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Retmasko"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Retmasko:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "Domajno:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Retmasko"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokaj Gastigiloj"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Redakti"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "Redakti"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Agordoj"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Apliki"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Ricevas dosierajn nomojn..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Konektante..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Trovi Dosierojn: Ne konektita al fora retejo\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Eraro: Ido %d rezultigis al %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Ido %d sukcese finis\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Eraro: Ido %d ne bone finis\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Eraro: Ne eblas trovi informon pri dosiero %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Dosiero %s ne ŝanĝita\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr "Dosiero %s estas ŝanĝita."
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Redakti Dosieron"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Finita"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Sendita %s el %s je %.2fKB/s, %02d:%02d:%02d taksita tempo restas"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Ricevis %s el %s je %.2fKB/s, %02d:%02d:%02d taksita tempo restas."
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Sendita %s el %s, transigo haltis, restanta tempo ne taksebla"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Ricevis je %s el %s, transigo paneis, nekonata tempo restas"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Nekonata procento finita. (Dosiero %ld el %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% finita, %02d:%02d:%02d taksita tempo restas. (Dosiero %ld el %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Trovas dosierajn nomojn...%s bajtoj"
 
-#: ../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
+#: 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 "Neniu dosiera transigo estas elektita\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Vido"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Redakti"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Vidigi: %s estas dosierujo. Ne eblas vidigi ĝin.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Redakti: %s estas dosierujo. Ne eblas redakti ĝin.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Redakti: Necesas agordi redaktilon en la agorda dialogo\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Vidigi: ne eblas forki alian procedon: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Rulas programon: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Malfermas je %s per %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Vidigas dosieron %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Vidigi: Ne eblas malfermi dosieron %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Ne eblas malfermi regantan terminalon %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Uzulonomo [anonima]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -3016,3 +2948,39 @@ msgstr ""
 "%s jam ekzistas. (%s fonta grando, %s cela grando):\n"
 "(s)uperskribi, (r)ekomenci, (e)lasi, (S)uperskribi ĉion, (R)ekomenci ĉion, "
 "(E)llasi ĉion: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Rezigni  "
+
+#~ msgid "Host: "
+#~ msgstr "Gastigilo: "
+
+#~ msgid "User: "
+#~ msgstr "Uzulo: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Fermi  "
+
+#~ msgid "Add"
+#~ msgstr "Aldoni"
+
+#~ msgid "Cancel"
+#~ msgstr "Rezigni"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Jes  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ne  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Network Address"
+#~ msgstr "Reta Adreso"
+
+#~ msgid "_Edit"
+#~ msgstr "Redakti"
+
+#~ msgid "Apply"
+#~ msgstr "Apliki"
diff --git a/po/es.po b/po/es.po
index 58138a9..f2cd926 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,52 +11,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.es\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-20 11:56+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2012-03-20 13:03+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
+"Language: es\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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s inválida\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Error: Línea no válida %s en el archivo índice del cache\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Error: No se puede crear el directorio %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error: No se puede crear el archivo temporal: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Error cerrando descriptor de archivo: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Error: No se puede buscar en el archivo %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -64,50 +63,50 @@ msgstr ""
 "Error al convertir la cadena «%s» desde el conjunto de caracteres %s al "
 "conjunto de caracteres %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error: No se puede abrir el archivo local %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Error: No se puede escribir en el socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Error: No se puede leer desde socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Error de gFTP: Nombre incorrecto para el archivo de marcadores %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 "Advertencia: No se puede encontrar el archivo maestro de marcadores %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Error de gFTP: No se puede abrir el archivo de marcadores %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Advertencia de gFTP: Omitiendo línea %d del archivo de marcadores: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Advertencia de gFTP: La línea %d no tiene suficientes argumentos\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -117,7 +116,7 @@ msgstr ""
 "local y no es necesario acceder a ellos a través del proxy (si lo hay). "
 "Sintaxis: dont_use_proxy=.dominio o dont_use_proxy=número_red/máscara"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -126,56 +125,56 @@ msgstr ""
 "visualización  Nota: Todos los argumentos excepto la extensión del archivo "
 "son opcionales"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Error de gFTP: Nombre del archivo de configuración %s incorrecto\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Error de gFTP: No se puede crear el directorio %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Error de gFTP: No se puede encontrar el archivo de configuración maestro %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "¿Hizo un `make install`?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Error de gFTP: No se puede abrir el archivo de configuración %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Terminando debido a errores de análisis en la línea %d del archivo de "
 "configuración\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 "Advertencia de gFTP: Omitiendo línea %d del archivo de configuración: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Error de gFTP: Nombre del archivo de bitácora incorrecto %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Advertencia de gFTP: No se puede abrir %s para escritura: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -184,7 +183,7 @@ msgstr ""
 "<masneyb gftp org>. Advertencia: Cualquier comentario que añada a este "
 "archivo SERÁ sobreescrito"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -196,7 +195,7 @@ msgstr ""
 "recordada fácilmente por alguien que le mire por encima del hombro mientras "
 "edita este archivo. Antes todas las contraseñas se guardaban en texto plano."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -207,96 +206,95 @@ msgstr ""
 "archivo SERÁ sobreescrito. Si una entrada tiene un (*) en su comentario, no "
 "podrá cambiarlo desde dentro de gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
-"Error FATAL: La opción de configuración «%s» no se encuentra en la tabla hash "
-"global\n"
+"Error FATAL: La opción de configuración «%s» no se encuentra en la tabla "
+"hash global\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error: No se puede subir el archivo %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error: No se puede escribir en el archivo %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error: Error al cerrar el archivo: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Listado de archivos corrompido desde el servidor FSP %s\n"
 
-#: ../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
+#: 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 "desconocido"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "No se puede obtener el listado del directorio FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Se cambió al directorio local %s correctamente\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "No se puede cambiar el directorio a %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Eliminado %s correctamente\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Error: No se puede eliminar el directorio %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error: No se puede eliminar el archivo %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Directorio %s creado correctamente\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Renombrado %s a %s correctamente\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Error: No se puede renombrar %s como %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -304,7 +302,7 @@ msgstr ""
 "El soporte FTPS no está disponible debido a que el soporte SSL no se ha "
 "compilado. Abortando conexión.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -312,108 +310,106 @@ msgstr ""
 "El soporte https no está disponible debido a que el soporte SSL no se ha "
 "compilado. Abortando conexión.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "No se puede obtener el directorio actual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Se cambió al directorio local %s correctamente\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "No se puede cambiar al directorio local %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Error: No se puede truncar el archivo local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "No se puede obtener el listado del directorio local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Modo de %s cambiados a %o correctamente\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Error: No se puede cambiar el modo de %s a %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Se cambió el sello de tiempo con éxito de %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Error: No se puede cambiar el sello de tiempo de %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema de archivos local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uso: gftp "
 
 # The following items are the proxy types listed under the Options dialog
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ninguno"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "archivo"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "tamaño"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "usuario"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "horafecha"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributos"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendiente"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendiente"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programa de visualización:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -421,28 +417,28 @@ msgstr ""
 "El programa predeterminado para ver los archivos. Si se deja en blanco, se "
 "utilizará el visor interno."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programa de edición:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Programa predeterminado para editar los archivos."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Tamaño máximo de ventana de bitácora:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "El máximo tamaño de la ventana de bitácora en bytes para la adaptación a GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conjuntos de caracteres remotos:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -450,11 +446,11 @@ msgstr ""
 "Esta es una lista separada por caracteres para intentar convertir los "
 "mensajes remotos a la localización actual"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remoto:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -462,185 +458,179 @@ msgstr ""
 "Este es el valor de LC_TIME para el sitio remoto. Esto es para que las "
 "fechas puedan parsearse apropiadamente en los listados del directorio."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Caché TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Número de segundos que se conservarán las entradas de la caché antes de que "
 "caduquen."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Añadir transferencias de archivos"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Añadir nuevas transferencias sobre las existentes"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Realizar una única transferencia a la vez"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "¿Realizar sólo una transferencia a la vez?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sobreescribir por omisión"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Habilitar la sobreescritura de archivos por omisión o continuar las "
 "transferencias de archivos"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Preservar permisos de archivo"
 
-#: ../lib/options.h:80
-#| msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
 msgid "Preserve file permissions of transferred files"
 msgstr "Preservar los permisos de los archivos transferidos"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Preservar el tiempo del archivo"
 
-#: ../lib/options.h:85
-#| msgid "Preserve file times of transfered files"
+#: lib/options.h:85
 msgid "Preserve file times of transferred files"
 msgstr "Preservar el tiempo de los archivos transferidos"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Actualizar después de cada transferencia"
 
-#: ../lib/options.h:90
-#| msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
 msgid "Refresh the listbox after each file is transferred"
 msgstr "Actualizar las ventanas después de cada transferencia de archivos"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordenar con los directorios al principio"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Muestra todos los directorios y después los archivos"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostrar archivos ocultos"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostrar los archivos ocultos en las ventanas de listados"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostrar el estado de la transferencia en el título"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Muestra el estado de la transferencia en la barra de título"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Comenzar transferencias"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Comenzar automáticamente las transferencias de archivos cuando se "
 "introduzcan en la cola"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permitir comandos manuales en el GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permite entrar comandos manualmente en el GUI (funciones como el puerto de "
 "texto)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Recordar el último directorio"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Guarda el último directorio local y remoto cuando la aplicación se cierra"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Conectar con el servidor remoto al iniciar"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Conectar automáticamente con el servidor remoto cuando se inicia la "
 "aplicación."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Red"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Tiempo de espera de red:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "El tiempo de espera para entrada/salida de red. Éste NO es un tiempo de "
 "espera de conexión inactiva."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Reintentos de conexión:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Número de intentos de conexión. Póngalo a 0 para reintentar indefinidamente"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Espera entre reintentos:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Número de segundos a esperar entre dos reintentos de conexión"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KiB/S Máximos :"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Velocidad máxima en KiB/s que se permitirá a una transferencia de archivos. "
 "(Póngalo a 0 para desactivar este límite)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Tamaño del bloque de transferencia:"
 
-#: ../lib/options.h:144
-#| msgid ""
-#| "The block size that is used when transfering files. This should be a "
-#| "multiple of 1024."
+#: lib/options.h:144
 msgid ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
@@ -648,19 +638,19 @@ msgstr ""
 "El tamaño de bloque que se usa al transferir archivos. Esto debería ser un "
 "múltiplo de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocolo predeterminado:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ésto especifica el protocolo predeterminado a usar"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activar soporte IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -668,27 +658,27 @@ msgstr ""
 "Ésto define qué ocurrirá al hacer una doble pulsación sobre un archivo en "
 "las listas. 0=Ver el archivo 1=Editar el archivo 2=Transferir el archivo"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Ancho predeterminado para la ventana de archivos locales"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Ancho predeterminado para la ventana de archivos remotos (servidor)"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Alto predeterminado para las ventanas de archivos locales y remotos"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Alto predeterminado para la ventana de transferencias"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Alto predeterminado para la ventana de bitácora"
 
-#: ../lib/options.h:177
+#: 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."
@@ -696,24 +686,24 @@ msgstr ""
 "El ancho de la columna «Archivo» en la ventana de transferencia. Póngalo a 0 "
 "para que se redimensione automáticamente."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "La columna por la que ordenar por omisión"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordenar ascendentemente o descendentemente"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 ""
-"Ancho de la columna «Archivo» en la ventana de archivos. Póngalo a 0 para que "
-"la columna se redimensione automáticamente. Póngalo a -1 para desactivar "
+"Ancho de la columna «Archivo» en la ventana de archivos. Póngalo a 0 para "
+"que la columna se redimensione automáticamente. Póngalo a -1 para desactivar "
 "esta columna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -722,7 +712,7 @@ msgstr ""
 "que la columna se redimensione automáticamente. Póngalo a -1 para "
 "desactivarla"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -731,100 +721,102 @@ msgstr ""
 "que la columna se redimensione automáticamente. Póngalo a -1 para "
 "desactivarla"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Ancho de la columna «Grupo» en las ventanas de archivos. Póngalo a 0 para que "
-"la columna se redimensione automáticamente. Póngalo a -1 para desactivarla"
+"Ancho de la columna «Grupo» en las ventanas de archivos. Póngalo a 0 para "
+"que la columna se redimensione automáticamente. Póngalo a -1 para "
+"desactivarla"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Ancho de la columna «Fecha» en las ventanas de archivos. Póngalo a 0 para que "
-"la columna se redimensione automáticamente. Póngalo a -1 para desactivarla"
+"Ancho de la columna «Fecha» en las ventanas de archivos. Póngalo a 0 para "
+"que la columna se redimensione automáticamente. Póngalo a -1 para "
+"desactivarla"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Ancho de la columna «Atributos» en las ventanas de archivos. Póngalo a 0 para "
-"que la columna se redimensione automáticamente. Póngalo a -1 para "
+"Ancho de la columna «Atributos» en las ventanas de archivos. Póngalo a 0 "
+"para que la columna se redimensione automáticamente. Póngalo a -1 para "
 "desactivarla"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "El color de los comandos que son enviados al servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "El color de los comandos que son recibidos desde el servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "El color de los mensajes de error"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "El color del resto de los mensajes de bitácora"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "La transferencia de archivos se limitará a %.2f KiB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Error al establecer LC_TIME a «%s». Se usará «%s»\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Cargando listado del directorio %s desde el caché (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Cargando listado de directorio %s desde el servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -833,113 +825,113 @@ msgstr ""
 "Advertencia: Recortando ruta de un archivo «%s». La ruta recortada (%s) no "
 "coincide con el directorio actual (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: No se puede escribir al caché %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: No se puede el marcador %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Error en los marcadores: La entrada %s no tiene un nombre de servidor\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "El protocolo «%s» actualmente no está soportado.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Se encontró un enlace simbólico recursivo %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Error: El servidor remoto %s desconectó. Se ha alcanzado el máximo número de "
 "reintentos…abandonando\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Error: El servidor remoto %s está desconectado. Se intentará volver a "
 "conectar en %d segundos\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Error: No se puede establecer el cierre en la marca de ejecución: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "No se puede abrir pty maestro %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "No se puede crear un par de sockets: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error: No se puede ejecutar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "No se puede bifurcar otro proceso: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nombre del servidor proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nombre del cortafuegos:"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Puerto Proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Puerto por el que conectar al cortafuegos"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nombre de usuario en el Proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Usuario en el cortafuegos"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Contraseña en el proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Contraseña en el cortafuegos"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Usar HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "¿Quiere usar HTTP/1.1 o HTTP/1.0?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -948,65 +940,65 @@ msgstr ""
 "Se recibió respuesta incorrecta del servidor, desconectando\n"
 "El servidor remoto devolvió un tamaño de trama erróneo «%s»\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Desconectando del sitio %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Iniciando la transferencia de archivos desde el offset"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "No se puede recibir el archivo %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Recibiendo listado del directorio…\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Se recibió respuesta incorrecta del servidor, desconectando\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Comando SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "usuario servidor"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "usuario servidor:puerto"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICACIÓN"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "usuario servidor puerto"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "usuario servidor NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Correo Electrónico:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1014,19 +1006,19 @@ msgstr ""
 "Esta es la contraseña que será usada cuando inicie sesión e un servidor FTP "
 "remoto como usuario anónimo"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Cuenta en el proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Cuenta en el cortafuegos (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo de servidor proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1043,11 +1035,11 @@ msgstr ""
 "(usuario), p (contraseña), h (host) o (puerto) o a(cuenta). Por ejemplo, "
 "para especificar el usuario proxy, puede poner %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorar dirección PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1059,11 +1051,11 @@ msgstr ""
 "a menudo se necesita para los encaminadores que dan su IP interna en vez de "
 "su dirección IP externa en una respuesta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferencias pasivas"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1079,11 +1071,11 @@ msgstr ""
 "esto está activado, entonces gFTP abrirá un puerto en el lado del cliente y "
 "el servidor remoto intentará conectarse a él."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolver enlaces simbólicos remotos (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1095,17 +1087,11 @@ msgstr ""
 "única vez que quiera desactivar esto es si el servidor remoto FTP no soporta "
 "la opción -L en LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferir ficheros en modo ASCII"
 
-#: ../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 text files. If you are transfering from UNIX to UNIX, "
-#| "then it is safe to leave this off. If you are downloading binary data, "
-#| "you will want to disable this."
+#: lib/rfc959.c:87
 msgid ""
 "If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
@@ -1119,335 +1105,326 @@ msgstr ""
 "transfiriendo de Unix a Unix, entonces es seguro dejar esto desactivado. Si "
 "está descargando datos binarios, querrá descargar esto."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Respuesta inválida «%c» recibida del servidor.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "No se puede crear un socket IPv4: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "No se puede encontrar una dirección IP en la respuesta PASV «%s»\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "Ignorar la dirección IP en la respuesta PASV, conectando a %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "No se puede crear una conexión de datos: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "No se puede obtener el nombre del socket: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "No se puede vincular un puerto: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "No se puede escuchar del puerto %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "No se puede crear un socket IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Erro: No parece que esté conectado por IPv6. abortando conexión.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Respuesta a EPSV inválida «%s»\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "No se puede obtener la dirección del socket local: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "No se puede aceptar conexión desde el servidor: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Advertencia: No se puede interpretar el listado %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Buscando %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "No se puede encontrar el servidor %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "No se puede crear un socket: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Intentando %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "No se puede conectar con %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Conectado a %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "No se puede encontrar el nombre del servicio %s/tcp. Compruebe su archivo de "
 "servicios\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Se excedió el tiempo máximo para la conexión %s\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "No se pueden obtener los flags del socket: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "No se puede poner el socket en estado no bloqueante: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nombre de programa SSH"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "La ruta al ejecutable SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parámetros adicionales para SSH"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parámetros adicionales para el programa SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Necesita Usuario/Contraseña SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Requiere un usuario/contraseña para conexiones SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Ejecutando programa: %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Introduzca la frase de paso para la clave RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Introduzca la frase de paso para la clave'"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "contraseña"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "¿(sí/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Introduzca la CONTRASEÑA:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduzca la contraseña SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Error: Se introdujo una contraseña incorrecta\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialización de Protocolo\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versión de protocolo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Abrir %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Cerrar\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Abrir directorio %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Leer directorio\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Eliminar archivo %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Crear directorio %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Borrar directorio %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Ruta verdadera %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributos de archivos\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Estadísticas %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "No existe el archivo o directorio"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 # The following few items are from the Edit Bookmarks dialog
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Fallo"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mensaje erróneo"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "No hay conexión"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Conexión perdida"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operación no soportada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Mensaje desconocido devuelto desde servidor"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Error: El tamaño del mensaje %d es demasiado grande:\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Error: Tamaño del mensaje %d demasiado grande desde servidor\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1455,41 +1432,41 @@ msgstr ""
 "Hubo un error inicializando la conexión SSh con el servidor remoto. El "
 "mensaje de error desde el servidor remoto sigue a continuación:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Abriendo conexión SSH a %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Inicio de sesión correcto en el servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Archivo de entropía SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Archivo de entropía SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Longitud de la semilla de entropía"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "El máximo número de bytes de semilla para el motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificar SSL del par"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1502,11 +1479,11 @@ msgstr ""
 "Asunto = %s\n"
 "Error %i: %s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "No se puede obtener el certificado del par\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1515,45 +1492,45 @@ msgstr ""
 "ERROR: El host en el certificado sSL (%s) no coincide con el host con el que "
 "hemos conectado (%s). Abortando conexión.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "No se puede inicializar la biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Error cargando los certificados SSL predeterminados\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Error al establecer la lista de cifrados (no hay cifrados válidos)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Error: El motor SSL no fue inicializado\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Erro estableciendo la conexión SSL (objeto BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Erro estableciendo la conexión SSL (objeto SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Error con el certificado del par: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operación cancelada\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Esperando %d segundos para volver a intentar la conexión\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1563,76 +1540,76 @@ msgstr ""
 "el archivo COPYING. Esto es software libre, y usted puede redistribuirlo "
 "bajo ciertas condiciones; para más detalles, lea el archivo COPYING.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Francisco Javier F. Serrador <serrador gnome org>\n"
 "Gustavo D. Vranjes <gvranjes abaconet com ar>"
 
-#: ../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
+#: 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 "Error: No está conectado a un servidor remoto\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "uso: chmod <modo> <archivo>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "uso: rename <nombre antiguo> <nombre nuevo>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "uso: delete <archivo>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "uso: rmdir <directorio>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uso: site <archivo>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "uso: mkdir <directorio nuevo>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "uso: chdir <directorio>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argumento inválido\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Borra la caché del directorio\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uso: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "uso: set [variable = valor]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Error: La variable %s no es una variable de configuración válida\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr ""
 "Error: La variable %s no está disponible en la adaptación a texto de gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1640,290 +1617,290 @@ msgstr ""
 "Comandos soportados:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uso: %s <filtro>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Muestra información de gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "Establece el modo actual de transferencia de archivos a Ascii (sólo para FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Establece el modo actual de transferencia de archivos a binario (sólo para "
 "FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Cambia el directorio de trabajo remoto"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Cambia los permisos de un archivo remoto"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opciones disponibles: caché"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desconecta de un sitio remoto"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Borra un archivo remoto"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Muestra el listado del directorio para el directorio remoto actual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Descarga archivo(s) remoto(s)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Muestra esta pantalla de ayuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "Icd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Cambia el directorio local de trabajo"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Cambia los permisos de un archivo local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Borra un archivo local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Muestra el listado del directorio para el directorio local actual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crea un directorio local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Muestra el directorio local actual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renombra un archivo local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Borra un directorio local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crea un directorio remoto"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Envía archivo(s) local(es)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Abre una conexión a un sitio remoto"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Muestra el directorio remoto actual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Sale de gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renombra un archivo remoto"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Borra un directorio remoto"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Muestra variables del archivo de configuración. Usted también puede "
 "establecer variables haciendo set var=valor"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "sitio"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Ejecuta un comando site específico"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Error: Comando no reconocido\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Transferido %s correctamente a %.2f KiB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Omitiendo archivo %s en equipo remoto %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Deteniendo transferencia en servidor %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "No se puede descargar %s de %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1932,37 +1909,36 @@ msgstr ""
 "Hubo %d archivos o directorios que no se pudieron transferir. Compruebe el "
 "registro de sucesos para ver qué elementos no se transfirieron."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Pulse el botón de detención antes de hacer cualquier otra cosa\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Ejecutar marcador"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Añadir marcador: Debe introducir un nombre para el marcador\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Añadir marcador: No se puede añadir el marcador %s porque ya existe un "
 "marcador con ese nombre\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Añadir marcador"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Añadir marcador: Debe introducir un nombre de servidor\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1972,31 +1948,31 @@ msgstr ""
 "Puede separar elementos con una barra / para incluirlos en un submenú\n"
 "(p.ej.: Sitios sobre Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Debe especificar un nombre para el marcador"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Carpeta nueva"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduzca el nombre de la carpeta nueva a crear"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Elemento nuevo"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduzca el nombre del elemento nuevo a crear"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -2005,109 +1981,102 @@ msgstr ""
 "¿Está seguro de que quiere borrar el marcador\n"
 "%s y todos sus descendientes?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Borrar marcador"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editar entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Servidor:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directorio Remoto:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directorio Local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Usuario:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Iniciar sesión como ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancelar  "
-
 # The following few items are from the Edit Bookmarks dialog
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Archivo"
 
 # Keep the english word tearoff in here
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Archivo/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Archivo/_Carpeta nueva…"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Archivo/_Elemento nuevo…"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Archivo/_Borrar"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Archivo/_Propiedades…"
 
 # Keep the english word sep in here
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Archivo/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Archivo/_Cerrar"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editar marcadores"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2115,93 +2084,92 @@ msgstr ""
 "Ahora puede ajustar los atributos de sus archivos\n"
 "Nota: No todos los servidores de ftp admiten la característica chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
 # Set user id
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Usuario"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lectura"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escritura"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Ejecución"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Otro"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "¿Está seguro de que quiere borrar éstos %ld archivos y éstos %ld directorios?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "¿Está seguro de que quiere borrar éstos %ld archivos"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "¿Está seguro de que quiere borrar éstos %ld directorios"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Borrar archivos/directorios"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL recibida %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrastrar y soltar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Salir"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2209,468 +2177,455 @@ msgstr ""
 "Hay transferencias de archivos en curso.\n"
 "¿Está seguro de que quiere salir?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Abrir lugar"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduzca un URL a la que conectarse"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Ventana _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Ventana _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binario"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/Prefere_ncias…"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Salir"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/desprender"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Abrir lugar…"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/_Desconectar"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Cambiar _filtro…"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Mostrar seleccionadas"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Seleccionar _todo"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Seleccionar todos los archivos"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deseleccionar todo"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Guardar listado de directorio…"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Enviar Comando SITE…"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/Cambiar de _directorio"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permisos…"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/Carpeta _nueva…"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Re_nombrar…"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Borrar…"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Editar…"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Ver…"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Refrescar"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remoto"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remoto/desprender"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remoto/Abrir lugar…"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remoto/_Desconectar"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remoto/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remoto/Cambiar _filtro…"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remoto/_Mostrar seleccionadas"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remoto/Seleccionar _todo"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remoto/Seleccionar todos los archivos"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remoto/Deseleccionar todo"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remoto/Guardar listado del directorio…"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remoto/Enviar comando SITE…"
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remoto/Cambiar _directorio"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remoto/_Permisos…"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remoto/Carpeta _nueva…"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remoto/Re_nombrar…"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remoto/_Borrar…"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remoto/_Editar…"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remoto/_Ver…"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remoto/_Refrescar"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Marcadores"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Marcadores/desprender"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Marcadores/Añadir _marcador"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Marcadores/Editar marcadores"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Marcadores/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferencias"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferencias/desprender"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferencias/_Iniciar"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferencias/_Detener"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferencias/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferencias/_Omitir archivo actual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferencias/_Borrar archivo"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferencias/_Subir archivo"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferencias/_Bajar archivo"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferencias/_Obtener archivos"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferencias/_Enviar archivos"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Registros"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Registros/desprender"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Registros/_Vaciar"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Registros/_Ver"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Registro/_Guardar…"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Herramientas"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Herramientas/desprender"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Herramientas/_Comparar ventanas"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Herramientas/_Vaciar cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Ayuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ayuda/desprender"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Servidor: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Servidor: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Puerto: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Usuario: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Usuario: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Contraseña: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Archivo"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Fecha"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributos"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Error: Debe introducir un servidor al que conectar\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduzca el usuario"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Introduzca su nombre de usuario para este sitio"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Introduzca su contraseña para este sitio"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operación cancelada…debe introducir una cadena\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Crear directorio"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduzca el nombre del directorio a crear"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "¿Qué nombre quiere darle a %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Sitio"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introducir comandos específicos del sitio"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Prefijar con SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Cambiar dir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Omitido"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Reanudar"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Omitir"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Enviar archivos"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2679,59 +2634,59 @@ msgstr ""
 "remoto\n"
 "Por favor, elija que quiere hacer"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Omitir archivo"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Cambiar Filtro: Operación cancelada…debe introducir una cadena\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Cambiar filtro"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduzca el filtro nuevo"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Error: No se puede abrir %s para escritura: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Guardar listado del directorio"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Error: Error escribiendo en %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Se escribió correctamente la bitácora en el archivo %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Guardar bitácora"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2740,11 +2695,11 @@ msgstr ""
 "No se puede encontrar el archivo COPYING que contiene el acuerdo sobre la "
 "licencia. Por favor, asegúrese de que está en %s o en %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Acerca de gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2755,27 +2710,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Página web oficial: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Acerca de…"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acuerdo de Licencia"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Cerrar  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparar ventanas"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desconecta del servidor remoto"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2784,72 +2735,56 @@ msgstr ""
 "del servidor está en blanco, entonces se presenta un diálogo que le permite "
 "introducir un URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (en caché) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "No conectado"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Error al abrir el archivo %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: No está conectado a un servidor remoto\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Esta característica no está disponible para este protocolo\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Sólo debe tener seleccionado un elemento\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Debe tener seleccionado al menos un elemento\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Añadir"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sí  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  No  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Obteniendo listado del directorio"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Parar  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2858,109 +2793,89 @@ msgstr ""
 "Recibidos %ld directorios\n"
 "y %ld archivos"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Error de gFTP: No se encontró el archivo %s en %s o %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editar equipo remoto"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Añadir equipo remoto"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Dirección de red"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Dirección de red:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Máscara de red"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "_Máscara de red:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Dominio:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Máscara de red"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Servidores locales"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opciones"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Recibiendo nombres de archivos…"
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Obtener archivos: No está conectado a un servidor remoto\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Error: Proceso hijo %d devolvió %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Proceso hijo %d finalizó correctamente\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Error: Proceso hijo %d no termino apropiadamente\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Error: No se puede obtener información sobre el archivo %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "El archivo %s no se cambió\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2969,120 +2884,159 @@ msgstr ""
 "El archivo %s ha cambiado.\n"
 "¿Quiere subirlo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editar archivo"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Finalizado"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Enviados %s de %s a %.2fKib/s, tiempo restante estim.: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recibidos %s de %s a %.2fKib/s, tiempo restante estim.: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Enviados %s de %s, transferencia detenida, tiempo restante desconocido"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Recibidos %s de %s, transferencia detenida, tiempo restante desconocido"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Porcentaje completado desconocido. (Archivo %ld de %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% completo, tiempo restante estimado: %02d:%02d:%02d. (Archivo %ld de %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Recibiendo nombres de archivos…%s bytes"
 
-#: ../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
+#: 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 "No hay transferencias de archivos seleccionadas\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Ver"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editar"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Ver: %s es un directorio. No se puede ver.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Editar: %s es un directorio. No puede editarlo.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Editar: Debe especificar un editor en el diálogo de opciones\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Ver: No se puede crear otro proceso: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Ejecutando programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Abriendo %s con %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viendo archivo %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Ver: No se puede abrir el archivo %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "No se puede abrir la terminal de control: %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Usuario [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ya existe. (tamaño de origen de %s, tamaño de destino de %s):\n"
 "s(o)breescribir, continua(r), (s)altar, S(O)breescribir todo, Continua(R) "
 "todo, (S)altar todo: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancelar  "
+
+#~ msgid "Host: "
+#~ msgstr "Servidor: "
+
+#~ msgid "User: "
+#~ msgstr "Usuario: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Cerrar  "
+
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Sí  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Network Address"
+#~ msgstr "Dirección de red"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
diff --git a/po/eu.po b/po/eu.po
index afad0b3..02b8820 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 18:00+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-03-29 23:45+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
@@ -20,40 +20,39 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Baliogabeko %s URLa\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Errorea: baliogabeko %s lerroa cacheko indize-fitxategian\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Errorea: ezin izan da %s direktorioa egin: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Errorea: ezin da aldi baterako fitxategia sortu: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Errorea fitxategi-deskriptorea ixtean: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Errorea: ezin da %s fitxategian bilatu: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -61,48 +60,48 @@ msgstr ""
 "Errorea %2$s karaktere-jokoko '%1$s' katea %3$s karaktere-jokora bihurtzean: "
 "%4$s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Errorea: Ezin da %s fitxategi lokala ireki: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Errorea: ezin izan da socket-ean idatzi: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Errorea: ezin izan da socket-etik irakurri: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP errorea: Laster-marken %s fitxategi-izen baliogabea\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Abisua: Ezin da aurkitu laster-marken %s fitxategi maisua\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP errorea: Ezin da ireki laster-marken %s fitxategia: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP abisua: Laster-marken fitxategiko %d lerroa saltatzen: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP abisua: %d lerroak ez ditu behar adina argumentu\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -112,7 +111,7 @@ msgstr ""
 "atera behar proxy zerbitzaritik (erabilgarri badago). Sintaxia: "
 "dont_use_proxy=.domeinua edo dont_use_proxy= sare-zenbakia/sare-maskara"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -121,53 +120,53 @@ msgstr ""
 "programa. Oharra: Argumentu guztiak, fitxategi-luzapena izan ezik, "
 "aukerakoak dira"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP errorea: Okerreko konfigurazio-fitxategi-izena: %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP errorea: Ezin izan da %s direktorioa egin: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP errorea: Ezin da aurkitu %s konfigurazio-fitxategi maisua\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "'make install' bat egin zenuen?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP errorea: Ezin da ireki %s konfigurazio-fitxategia: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Ixten, konfigurazio-fitxategiko %d lerroan analisi-erroreak daudelako\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP abisua: Konfigurazio-fitxategiko %d lerroa saltatzen: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP errorea: Okerreko %s egunkari-fitxategiaren izena\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP abisua: Ezin da %s idazteko ireki: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -176,7 +175,7 @@ msgstr ""
 "<masneyb gftp org>. Abisua: Fitxategi honi gehitzen dizkiozun iruzkin "
 "guztiak GAINIDATZIKO dira"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -188,7 +187,7 @@ msgstr ""
 "dagoen batek batek erraz gogoratu ahal izan ez dezan. Horren aurretik, "
 "pasahitz guztiak testu arruntean biltegiratu dira."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -199,96 +198,95 @@ msgstr ""
 "guztiak GAINIDATZIKO dira. Sarrera batek (*) badu bere iruzkinean, ezingo "
 "duzu aldatu gFTP barruan"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ezezaguna>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 errore LARRIA: '%s' konfigurazio-aukera ez da aurkitu hash taula "
 "globalean\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Errorea: ezin da %s fitxategia kargatu\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Errorea: ezin da %s fitxategian idatzi: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Errorea: errorea fitxategia ixtean: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Hondatutako %s fitxategi-zerrenda FSP zerbitzaritik\n"
 
-#: ../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
+#: 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 "ezezaguna"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Ezin izan da %s FSP direktorio-zerrenda lortu: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Ondo aldatu zara %s direktoriora\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Ezin izan da %s direktoriora aldatu\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Ondo kendu da %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Errorea: ezin izan da %s direktorioa kendu: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Errorea: ezin izan da %s fitxategia kendu: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Ondo egin da %s direktorioa\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Ondo aldatu da izena: %s -> %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Errorea: ezin izan zaio %s karpetari %s izena jarri: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -296,7 +294,7 @@ msgstr ""
 "FTPS euskarria ezin da erabili SSL euskarria ez dagoelako konpilatuta. "
 "Konexioa abortatzen.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -304,107 +302,105 @@ msgstr ""
 "HTTPS euskarria ezin da erabili SSL euskarria ez dagoelako konpilatuta. "
 "Konexioa abortatzen.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Ezin izan da lortu uneko lan-direktorioa: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Ondo aldatu zara %s direktorio lokalera\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Ezin izan da %s direktorio lokalera aldatu: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Errorea: ezin da trunkatu %s fitxategi lokala: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Ezin izan da %s direktorio-zerrenda lokala lortu: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Ondo aldatu da %s modua %o modura\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Errorea: ezin izan da aldatu %s(r)en modua %o modura: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Ondo aldatu da %s(r)en ordu-zigilua\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Errorea: ezin izan da aldatu %s(r)en ordu-zigilua: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "fitxategi-sistema lokala"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "erabilera: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "bat ere ez"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fitxategia"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "tamaina"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "jabea"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "taldea"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "data/ordua"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atrib"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "beherantz"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "gorantz"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Orokorra"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Ikusteko programa:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -412,27 +408,27 @@ msgstr ""
 "Fitxategiak ikusteko erabilitako programa lehenetsia. Hutsik badago, barneko "
 "fitxategi-ikustailea erabiliko da "
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Editatzeko programa:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Fitxategiak editatzeko erabilitako programa lehenetsia."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Egunkari-fitxategiaren gehieneko tamaina:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Egunkari-leihoaren gehienezko tamaina bytetan GTK+ atakarako"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Urruneko karaktere-jokoak:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -440,11 +436,11 @@ msgstr ""
 "Koma bidez bereizitako karaktere-jokoen zerrenda da, urruneko mezuak uneko "
 "lokalak bihurtzen saiatzeko"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Urruneko LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -452,192 +448,196 @@ msgstr ""
 "Urruneko gunearen LC_TIME balioa da hau. Hala da datak ondo analizatu ahal "
 "izateko direktorio-zerrendan."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Cacheko sarrerak iraungi aurretik gordetzeko segundo kopurua."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Erantsi fitxategi-transferentziak"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Erantsi fitxategi-transferentzia berriak lehendik daudenei"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Egin transferentzia bat aldiko"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Aldiro transferentzia bat egin?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Gainidatzi modu lehenetsian"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Gainidatzi fitxategiak modu lehenetsian, edo ezarri fitxategi-"
 "transferentziei berrekitea"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Mantendu fitxategi-baimenak"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Mantendu transferitutako fitxategien fitxategi-baimenak"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Mantendu fitxategi-ordua"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Mantendu transferitutako fitxategien fitxategi-orduak"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Freskatu fitxategi-transferentzia bakoitzaren ondoren"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Freskatu zerrenda-koadroa fitxategi bakoitza transferitu ondoren"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordenatu direktorioak lehendabizi"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Ezarri direktorioak lehendabizi, gero fitxategiak"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Erakutsi ezkutuko fitxategiak"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Erakutsi ezkutuko fitxategiak zerrenda-koadroetan"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Erakutsi transferentzia-egoera tituluan"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Erakutsi fitxategiaren transferentzia-egoera titulu-barran"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Hasi fitxategi-transferentziekin"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Hasi automatikoki fitxategi-transferentziekin ilaran jartzean"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Onartu eskuzko komandoak GUIn"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "Onartu GUIn eskuzko komandoak sartzea (testu-atakaren funtzioa, etab.)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Gogoratu azken direktorioa"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Gorde azken direktorio lokala eta urruneko direktorioa aplikazioa ixtean"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Konektatu urruneko zerbitzariarekin abioan"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Konektatu automatikoki urruneko zerbitzariarekin aplikazioa abiaraztean."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Sarea"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Sarearen denbora-muga:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Sarearen sarreraren/irteeraren zain egon beharreko denbora-muga. EZ da "
 "denbora-muga inaktiboa."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Konexio-saiakerak:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Egin beharreko saiakera automatikoen kopurua. Ezarri 0 etengabe saiatzeko."
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Saiatu berriro lo-denborarekin:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Saiakeren artean itxaron beharreko segundo kopurua"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KB/s gehienez:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Fitxategi-transferentzia batek gehienez har ditzakeen KB/s (Ezarri 0 "
 "desgaitzeko)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Transferitzeko bloke-tamaina:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Fitxategiak transferitzean erabili beharreko bloke-tamaina. 1024ren "
 "multiploa izan beharko luke."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protokolo lehenetsia:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Erabili beharreko protokolo lehenetsia zehazten du"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Gaitu IPv6 bateragarritasuna"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -646,28 +646,28 @@ msgstr ""
 "gertatuko dena zehazten du. 0=Ikusi fitxategia, 1=Editatu fitxategia, "
 "2=Transferitu fitxategia"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Fitxategi lokalen zerrenda-koadroaren zabalera lehenetsia"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Urruneko fitxategien zerrenda-koadroaren zabalera lehenetsia"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 "Urruneko fitxategien/fitxategi lokalen zerrenda-koadroaren altuera lehenetsia"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Transferentzien zerrenda-koadroaren altuera lehenetsia"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Erregistratzeko leihoaren altuera lehenetsia"
 
-#: ../lib/options.h:177
+#: 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."
@@ -675,15 +675,15 @@ msgstr ""
 "Fitxategi-izenen zutabeak transferentzia-leihoan duen zabalera. Ezarri 0 "
 "zutabe hau automatikoki alda dadin tamainaz."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Ordenatzeko zutabe lehenetsia"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordenatu gorantz edo beherantz"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -692,7 +692,7 @@ msgstr ""
 "Ezarri 0 zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea "
 "desgaitzeko"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -700,7 +700,7 @@ msgstr ""
 "Tamainaren zutabeak fitxategien zerrenda-koadroan duen zabalera. Ezarri 0 "
 "zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea desgaitzeko"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -709,7 +709,7 @@ msgstr ""
 "Ezarri 0 zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea "
 "desgaitzeko"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -717,7 +717,7 @@ msgstr ""
 "Taldearen zutabeak fitxategien zerrenda-koadroan duen zabalera. Ezarri 0 "
 "zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea desgaitzeko"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -725,7 +725,7 @@ msgstr ""
 "Dataren zutabeak fitxategien zerrenda-koadroan duen zabalera. Ezarri 0 "
 "zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea desgaitzeko"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -733,75 +733,75 @@ msgstr ""
 "Atributuen zutabeak fitxategien zerrenda-koadroan duen zabalera. Ezarri 0 "
 "zutabe hau automatikoki alda dadin tamainaz. Ezarri -1 zutabea desgaitzeko"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Zerbitzarira bidalitako komandoen kolorea"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Zerbitzaritik jasotako komandoen kolorea"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Errore-mezuen kolorea"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Gainerako egunkari-mezuen kolorea"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokala"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Laster-marka"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Fitxategi-transferentzia %.2f KB/s arte azeleratuko da\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Errorea LC_TIME '%s'(e)n ezartzean. '%s'(e)ra itzultzen\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "%s direktorio-zerrenda cachetik kargatzen (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "%s direktorio-zerrenda zerbitzaritik kargatzen (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -810,113 +810,113 @@ msgstr ""
 "Kontuz: '%s' fitxategiaren bide-izena kentzen. Kendutako bide-izena (%s) ez "
 "dator bat uneko direktorioarekin (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Errorea: ezin da cachean idatzi: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Errorea: ezin izan da %s liburu-marka aurkitu\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Laster-marken errorea: Laster-marken %s sarrerak ez du ostalari-izenik\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Une honetan ez da onartzen '%s' protokoloa.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "%s esteka sinboliko errekurtsiboa aurkitu da\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Errorea: urruneko %s gunea deskonektatuta dago. Gehieneko saiakera kopurura "
 "heldu da... uzten\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Errorea: urruneko %s gunea deskonektatuta dago. %d segundotan berriro "
 "konektatuko da\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Errorea: ezin da ezarri close on exec marka: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Ezin da ireki %s pty maisua: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Ezin da sortu socket bikoterik: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Errorea: ezin da ssh exekutatu: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Ezin da sardetu beste prozesurik: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxyaren ostalari-izena:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Suebakiaren ostalari-izena"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxyaren ataka:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Suebakiarekin konektatzeko ataka"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxy-aren erabiltzaile-izena:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Zure suebakiaren erabiltzaile-izena"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxyaren pasahitza:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Zure suebakiaren pasahitza"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Erabili HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "HTTP/1.1 edo HTTP/1.0 erabili nahi duzu?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -925,65 +925,65 @@ msgstr ""
 "Okerreko erantzuna jaso da zerbitzaritik, deskonektatzen\n"
 "Urruneko zerbitzariak '%s' zatiaren tamaina baliogabea itzuli du\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "%s gunetik deskonektatzen\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Fitxategi-transferentziarekin hasten desplazamenduan "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Ezin da %s fitxategia jaso\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Direktorio-zerrenda jasotzen...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Okerreko erantzuna jaso da zerbitzaritik, deskonektatzen\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE komandoa"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "erabiltzaile-izena ostalaria"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "erabiltzaile-izena ostalaria:ataka"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTIFIKATU"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "erabiltzaile-izena ostalaria ataka"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "erabiltzaile-izena ostalaria NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP proxya"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Pertsonalizatu"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Helbide elektronikoa:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -991,19 +991,19 @@ msgstr ""
 "Pasahitz hau erabiliko duzu urruneko FTP zerbitzari batean anonimo gisa "
 "sartzen zaren bakoitzean"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxyaren kontua:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Zure suebakiaren kontua (aukerakoa)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxy-zerbitzariaren mota:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1020,11 +1020,11 @@ msgstr ""
 "izena), p (pasahitza), h (ostalaria), o (ataka) edo a (kontua) izan "
 "daitezke. Esate baterako, proxy-zerbitzaria zehazteko %pu idatz dezakezu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ez ikusi egin PASV helbideari"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1036,11 +1036,11 @@ msgstr ""
 "Hau askotan behar da PASV erantzunetan barneko IP helbidea eta ez kanpokoa "
 "ematen duten bideratzaileekin."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Fitxategi-transferentzia pasiboak"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1056,11 +1056,11 @@ msgstr ""
 "gFTPk ataka bat irekiko du bezeroaren aldean eta urruneko zerbitzaria "
 "harekin konektatzen saiatuko da."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Konpondu urruneko esteka sinbolikoak (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1072,15 +1072,16 @@ msgstr ""
 "desgaitu nahiko duzu hau urruneko FTP zerbitzariak ez badu -L aukera "
 "onartzen ZERRENDAn"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferitu fitxategiak ASCII moduan"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1090,334 +1091,325 @@ msgstr ""
 "transferitzen ari bazara, segurua izaten da hau aktibatu gabe uztea. Datu "
 "bitarrak deskargatzen ari bazara, hau desgaitu nahiko duzu."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Zerbitzaritik jasotako baliogabeko '%c' erantzuna.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Huts egin du IPv4 socket bat sortzean: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Ezin da aurkitu IP helbiderik PASV '%s' erantzunean\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "Ez ikusi egiten IP helbideari PASV erantzunetan, %d.%d.%d.%d:%d(r)ekin "
 "konektatzen\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Ezin da sortu datu-konexiorik: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Ezin da lortu socket izena: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Ezin da lortu ataka: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Ezin da entzun %d atakan: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Huts egin du IPv6 socket bat sortzean: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Errorea: ez dirudi IPv6 bidez konektatuta gaudenik. Konexioa abortatzen.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Baliogabeko '%s' EPSV erantzuna\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Ezin da lortu socket lokalaren helbidea: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Ezin da zerbitzari-konexioa onartu: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "guztira"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Abisua: ezin da analizatu %s zerrenda\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "%s bilatzen\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Ezin da bilatu %s ostalari-izena: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Huts egin du socket bat sortzean: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "%s:%d saiatzen\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Ezin da konektatu %s(r)ekin: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "%s:%d(r)ekin konektatuta\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 "Ezin da bilatu %s/tcp zerbitzu-izena. Begiratu zerbitzuen fitxategia\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "%s(r)ekiko konexio-denbora agortu da\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Ezin dira lortu socket markak: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Ezin da ezarri socket-a blokeatu gabe: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Prog izena:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH exekutagarriaren bide-izena"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH parametro gehigarriak:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH programara pasatzeko parametro gehigarriak"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH erabiltzailea/pasahitza behar dira"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH konexioetarako erabiltzailea/pasahitza behar dira"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "%s programa exekutatzen\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Sartu pasaesaldia RSA gakorako"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Sartu pasaesaldia gako honentzako '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "pasahitza"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(bai/ez)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Sartu PASAKODEA:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Sartu SecurID pasahitza:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Errorea: okerreko pasahitza sartu da\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: protokolo-hasieratzea\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: %d protokolo-bertsioa\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Ireki %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Itxi\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Ireki %s direktorioa\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Irakurri direktorioa\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Kendu %s fitxategia\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Sortu %s direktorioa\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Kendu %s direktorioa\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: benetako bide-izena %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Fitxategi-atributuak\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Ados"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ez dago horrelako fitxategi edo direktoriorik"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Huts egin du"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mezu txarra"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Konexiorik ez"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Konexioa galdu da"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Eragiketa ez da onartzen"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Zerbitzariak itzulitako mezua ezezaguna da"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Errorea: %d mezu-tamaina handiegia da\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Errorea: zerbitzariko %d mezu-tamaina handiegia da\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1425,41 +1417,41 @@ msgstr ""
 "Errore bat gertatu da SSH konexio bat urruneko zerbitzariarekin "
 "hasieratzean. Urruneko zerbitzariko errore-mezua honela jarraitzen du:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSHren %s(r)ekiko konexioa irekitzen\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Ondo hasi da saioa %s SSH zerbitzarian\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL motorra"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL entropia-fitxategia:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropia-fitxategia"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropia-haziaren luzera:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL motorrean eskuragarri uzteko gehienezko byte kopurua"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Egiaztatu SSL parekoa"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1472,11 +1464,11 @@ msgstr ""
 "Gaia = %s\n"
 "Errorea %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Ezin da lortu parekoaren ziurtagiria\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1485,45 +1477,45 @@ msgstr ""
 "ERROREA: SSL ziurtagiriaren (%s) ostalaria ez dator bat gu konektatu garen "
 "ostalariarekin (%s). Konexioa abortatzen.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Ezin da hasieratu OpenSSL liburutegia\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Errorea SSL ziurtagiri lehenetsiak kargatzean\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Errorea zifratze-zerrenda ezartzean (baliozko zifratzerik ez)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Errorea: SSL motorra ez da hasieratu\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Errorea SSL konexioa konfiguratzen (BIO objektua)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Errorea SSL konexioa konfiguratzen (SSL objektua)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Errorea parekoaren ziurtagiriarekin: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Eragiketa bertan behera utzi da\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "%d segundo itxaroten berriro konektatzen saiatu arte\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1533,73 +1525,73 @@ msgstr ""
 "software librea da, eta birbana dezakezu baldintza batzuk betetzen badituzu; "
 "xehetasunetarako, ikus COPYING fitxategia\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Honek itzulia:"
 
-#: ../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
+#: 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 "Errorea: ez dago konektatuta urruneko gune batekin\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "erabilera: chmod <modua> <fitxategia>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "erabilera: rename <izen zaharra> <izen berria>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "erabilera: delete <fitxategia>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "erabilera: rmdir <direktorioa>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "erabilera: site <gunearen komandoa>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "erabilera: mkdir <direktorio berria>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "erabilera: chdir <direktorioa>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argumentu baliogabea\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Garbitu direktorioaren cachea\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "erabilera: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "erabilera: set [aldagaia = balioa]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Errorea: %s aldagaia ez da konfigurazio-aldagai baliozkoa.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Errorea: %s aldagaia ez dago erabilgarri gFTPren testu-atakan\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1607,291 +1599,291 @@ msgstr ""
 "Onartutako komandoak:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "erabilera: %s <iragazkia>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "honi buruz"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP informazioa erakusten du"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "Uneko fitxategi-transferentziaren modua Ascii-n ezartzen du (FTPrako "
 "bakarrik)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "bitarra"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Uneko fitxategi-transferentziaren modua Bitarrean ezartzen du (FTPrako "
 "bakarrik)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Laneko urruneko direktorioa aldatzen du"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Urruneko fitxategi baten baimenak aldatzen ditu"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Aukera erabilgarriak: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Urruneko gunetik deskonektatzen da"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Urruneko fitxategia kentzen du"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Uneko urruneko direktorioaren direktorio-zerrenda erakusten du"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Urruneko fitxategiak deskargatzen ditu"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Laguntza-pantaila hau bistaratzen du"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Laneko urruneko direktorioa aldatzen du"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Fitxategi lokal baten baimenak aldatzen ditu"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Fitxategi lokal bat kentzen du"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Uneko direktorio lokalaren direktorio-zerrenda erakusten du"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Direktorio lokal bat sortzen du"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Erakutsi uneko direktorio lokala"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Aldatu izena fitxategi lokal bati"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Kendu direktorio lokal bat"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Urruneko direktorio bat sortzen du"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Fitxategi lokalak kargatzen ditu"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Urruneko gune batekiko konexioa irekitzen du"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Erakutsi uneko urruneko direktorioa"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Irten gFTPtik"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Aldatu izena urruneko fitxategi bati"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Kendu urruneko direktorio bat"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Erakutsi konfigurazio-fitxategiaren aldagaiak. Aldagaiak ezartzeko, ezarri "
 "aldagaia=balioa"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Exekutatu guneko komando espezifikoa"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Errorea: komando ezezaguna\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Ondo transferitu da %s (%.2f KB/s)\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s fitxategia saltatzen %s ostalarian\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s ostalariko transferentzia gelditzen\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Ezin izan da %s deskargatu %s(e)tik\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1900,37 +1892,36 @@ msgstr ""
 "%d fitxategi edo direktorio ezin izan dira transferitu. Begiratu egunkarian "
 "zein elementu ez diren ondo transferitu."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Beste edozein gauza egin aurretik, sakatu gelditzeko botoia\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Exekutatu laster-marka"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Gehitu liburu-marka: Laster-markaren izena adierazi behar duzu\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Gehitu liburu-marka: Ezin da gehitu %s laster-marka izena lehendik "
 "dagoelako\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Gehitu liburu-marka"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Gehitu liburu-marka: Ostalari-izena sartu behar duzu\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1940,31 +1931,31 @@ msgstr ""
 "Erabili / elementuak bereizteko azpimenu batean sartzeko\n"
 "(adib.: Linux guneak/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Gogoratu pasahitza"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Laster-markaren izena adierazi behar duzu."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Karpeta berria"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Sartu sortu beharreko karpeta berriaren izena"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Elementu berria"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Sartu sortu beharreko elementu berriaren izena"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1973,106 +1964,99 @@ msgstr ""
 "Ziur zaude %s laster-marka eta bere ume guztiak\n"
 "betiko ezabatu nahi dituzula?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Ezabatu laster-marka"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Laster-markak"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editatu sarrera"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Ostalari-izena:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Ataka:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Urruneko direktorioa:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Direktorio lokala:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Kontua:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Hasi saioa ANONYMOUS gisa"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Utzi  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fitxategia"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fitxategia/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fitxategia/_Karpeta berria..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fitxategia/_Elementu berria..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fitxategia/E_zabatu"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fitxategia/_Propietateak..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fitxategia/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fitxategia/It_xi"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editatu laster-markak"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2080,92 +2064,91 @@ msgstr ""
 "Zure fitxategien atributuak doitu ditzakezu orain\n"
 "Oharra: ftp zerbitzari guztiek ez dute chmod eginbidea onartzen"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Berezia"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Itsaskorra"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Jabea"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Irakurri"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Idatzi"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Exekutatu"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Besteak"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Ziur zaude ezabatu nahi dituzula %ld fitxategi eta %ld direktorio hauek"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Ziur zaude %ld fitxategi hauek ezabatu nahi dituzula?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Ziur zaude %ld direktorio hauek ezabatu nahi dituzula?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Ezabatu fitxategiak/direktorioak"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Konektatu"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Jasotako %s URLa\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrastatu eta jaregin"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Irten"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2173,469 +2156,456 @@ msgstr ""
 "Fitxategi-transferentziak daude martxan.\n"
 "Ziur zaude irten nahi duzula?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Ireki kokalekua"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Sartu konektatu beharreko URLa"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FT_P"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/_1. leihoa"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/_2. leihoa"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Bitarra"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Hobespenak..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Irten"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokala"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokala/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokala/Ireki _kokalekua..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokala/De_skonektatu"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokala/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokala/Aldatu _iragazkia..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokala/_Erakutsi hautapena"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokala/_Hautatu denak"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokala/Hautatu fitxategi guztiak"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokala/Desautatu denak"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokala/Gorde direktorioen zerrenda..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokala/Bidali SITE komandoa..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokala/_Aldatu direktorioz"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokala/_Baimenak..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Lokala/Ka_rpeta berria..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokala/Aldatu ize_nez..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokala/E_zabatu..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokala/E_ditatu..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokala/Ik_usi..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokala/_Freskatu"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Urrunekoa"
 
 # Keep the english word tearoff in here
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Urrunekoa/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Urrunekoa/Ireki _kokalekua..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Urrunekoa/De_skonektatu"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Urrunekoa/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Urrunekoa/Aldatu _iragazkia..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Urrunekoa/_Erakutsi hautapena"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Urrunekoa/_Hautatu denak"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Urrunekoa/Hautatu fitxategi guztiak"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Urrunekoa/Desautatu denak"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Urrunekoa/Gorde direktorioen zerrenda..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Urrunekoa/Bidali SITE komandoa..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Urrunekoa/Aldatu _direktorioz"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Urrunekoa/_Baimenak..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Urrunekoa/Ka_rpeta berria..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Urrunekoa/Aldatu ize_nez..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Urrunekoa/E_zabatu..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Urrunekoa/E_ditatu..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Urrunekoa/Ik_usi..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Urrunekoa/_Freskatu"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Laster-markak"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Laster-markak/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Laster-markak/_Gehitu laster-marka"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Laster-markak/Editatu laster-markak"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Laster-markak/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferentziak"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferentziak/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferentziak/_Hasi"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferentziak/_Gelditu"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferentziak/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferentziak/Saltatu _uneko fitxategia"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferentziak/_Kendu fitxategia"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferentziak/Eraman fitxategia g_ora"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferentziak/Eraman fitxategia _behera"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferentziak/_Eskuratu fitxategiak"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferentziak/_Jarri fitxategiak"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Egunkaria"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Egunkaria/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Egunkaria/_Garbitu"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Egunkaria/_Ikusi"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Egunkaria/_Gorde..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/T_resnak"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tresnak/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Tresnak/_Konparatu leihoak"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Tresnak/_Garbitu cachea"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/_Laguntza"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Laguntza/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Laguntza/Honi _buruz"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Ostalaria: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Ostalaria: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Ataka: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Erabiltzailea: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Erabiltzailea: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Pasatu: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komandoa: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Fitxategi-izena"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributuak"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Aurrerapena"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Errorea: ostalari bat idatzi behar duzu konekta dadin\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Sartu erabiltzaile-izena"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Sartu gune honetarako duzun erabiltzaile-izena"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Sartu gune honetarako daukazun erabiltzaile-izena"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Eragiketa bertan behera utzi da... kate bat sartu behar duzu\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Make Directory"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Sartu sortu beharreko direktorio berriaren izena"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rename"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Zein izen jarri nahi diozu %s(r)i?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Sartu guneko komando espezifikoa"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE aurretik"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Saltatu da"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Berrekin"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Saltatu"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Ekintza"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferitu fitxategiak"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2643,61 +2613,61 @@ msgstr ""
 "Ondoko fitxategiak ordenagailu lokalean eta urruneko ordenagailuan daude\n"
 "Hautatu zer egin nahi duzun"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Errorea"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Saltatu fitxategia"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Hautatu dena"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Desautatu denak"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Aldatu Filespec: Eragiketa bertan behera utzi da... kate bat sartu behar "
 "duzu\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Aldatu Filespec"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Sartu fitxategiaren zehaztapen berria"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Errorea: ezin da %s idazteko ireki: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Gorde direktorio-zerrenda"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Errorea: errorea %s(e)n idaztean: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Ondo idatzi da egunkari-fitxategia %s(e)n\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Gorde egunkaria"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2706,11 +2676,11 @@ msgstr ""
 "Ezin da aurkitu lizentzia-kontratuaren COPYING fitxategia. Ziurtatu %s(e)n "
 "edo %s(e)n dagoela"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTPri buruz"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2721,27 +2691,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Etxeko orri ofiziala: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Lizentzia-kontratua"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Itxi  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compare Windows"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Deskonektatu urruneko zerbitzaritik"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2749,72 +2715,56 @@ msgstr ""
 "Konektatu ostalari-sarreran zehaztutako gunearekin. Ostalari-sarrera hutsik "
 "badago, elkarrizketa-koadro bat azalduko da URL bat sar dezazun."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cachean gordeta) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Konektatu gabe"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Errorea %s fitxategia irekitzean: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Ez dago konektatuta urruneko gune batekin\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Eginbide hau ez dago erabilgarri protokolo hau erabiliz\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Elementu bat bakarrik eduki behar duzu hautatuta\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Elementu bat gutxienez eduki behar duzu hautatuta\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Aldatu"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Gehitu"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Utzi"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Bai  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Ez  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Direktorio-zerrendak lortzen"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Gelditu  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2823,109 +2773,89 @@ msgstr ""
 "%ld direktorio eta %ld fitxategi\n"
 "jaso dira"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP errorea: Ezin da aurkitu %s fitxategian %s(e)n edo %s(e)n\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editatu ostalaria"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Gehitu ostalaria"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Mota:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Mota:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domeinua"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Sareko helbidea"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Sareko helbidea:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Sare-maskara"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "S_are-maskara:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domeinua:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Sare-maskara"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Ostalari lokalak"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Editatu"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editatu"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Aukerak"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplikatu"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Fitxategi-izenak jasotzen..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Konektatzen..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Eskuratu fitxategiak: Ez dago konektatuta urruneko gune batekin\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Errorea: %d umeak %d itzuli du\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "%d umea ondo itzuli da\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Errorea: %d umea ez da ondo amaitu\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Errorea: ezin da informaziorik lortu %s fitxategiari buruz: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "%s fitxategia ez da aldatu\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2934,114 +2864,117 @@ msgstr ""
 "%s fitxategia aldatu da.\n"
 "Kargatu nahi duzu?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editatu fitxategia"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Amaituta"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s / %s bidalita (%.2fKB/s), %02d:%02d:%02d gelditzen den denbora ggb"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "%s/%s bidalita (%.2fKB/s), %02d:%02d:%02d gelditzen den gutxi gorabeherako "
 "denb."
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "%s / %s bidalita, transferentzia trabatuta, geratzen den denbora ezezaguna"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "%s / %s jasota, transferentzia trabatuta, geratzen den denbora ezezaguna"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Osatutako ehuneko ezezaguna. (%ld / %ld fitxategi)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% osatuta, %02d:%02d:%02d gelditzen den gutxi gorabeherako denb. (%ld / "
 "%ld fitxategi)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Fitxategi-izenak eskuratzen...%s byte"
 
-#: ../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
+#: 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 "Ez dago fitxategi-transferentziarik hautatuta\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Ikusi"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editatu"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Ikusi: %s direktorioa da. Ezin da ikusi.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Editatu: %s direktorioa da. Ezin da editatu.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Editatu: Editore bat zehaztu behar da aukeren elkarrizketa-koadroan\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Ikusi: Ezin da sardetu beste prozesurik: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Exekutatzen ari den programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s irekitzen %s(r)ekin\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s fitxategia ikusten\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Ikusi: Ezin da %s fitxategia ireki: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Ezin da ireki kontrolatzen duen %s terminala\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Erabiltzaile-izena [anonimoa]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -3051,3 +2984,39 @@ msgstr ""
 "%s badago lehendik ere. (%s sorburu-tamaina, %s helburu-tamaina):\n"
 "(o) gainidatzi, (r) jarraitu, (s) saltatu, (O) gainidatzi denak, (R) "
 "jarraitu denak, (S) saltatu denak: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Utzi  "
+
+#~ msgid "Host: "
+#~ msgstr "Ostalaria: "
+
+#~ msgid "User: "
+#~ msgstr "Erabiltzailea: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Itxi  "
+
+#~ msgid "Add"
+#~ msgstr "Gehitu"
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Bai  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ez  "
+
+#~ msgid "Type:"
+#~ msgstr "Mota:"
+
+#~ msgid "Network Address"
+#~ msgstr "Sareko helbidea"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editatu"
+
+#~ msgid "Apply"
+#~ msgstr "Aplikatu"
diff --git a/po/fi.po b/po/fi.po
index 0429512..742f5b7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,96 +1,103 @@
 # Finnish messages file for gFTP
 # Copyright (C) 1999 Brian Masney <masneyb gftp org>
-# 
+#
 # Ilkka Tuohela, <hile iki fi> 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 21:58+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2006-10-22 08:20+0300\n"
 "Last-Translator: Ilkka Tuohela <hile iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Virheellinen URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Virhe: Virheellinen rivi %s välimuistin indeksitiedostossa\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Virhe: kansiota %s ei voida luoda: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Virhe: Väliaikaistiedoston luonti epäonnistui: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Virhe suljettaessa tiedostokuvaajaa: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Virhe siirryttäessä tiedostossa %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3209
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Virhe muunnettaessa merkkijonoa '%s' merkistöstä %s merkistöön %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Virhe: Paikallisen tiedoston %s avaaminen epäonnistui: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2910 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Virhe: Pistokkeeseen ei voida kirjoittaa: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2831 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Virhe: Pistokkeesta ei voitu lukea: %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:n Virhe: Kirjanmerkkitiedoston nimi %s on virheellinen\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Varoitus: Kirjanmerkkitiedostoa %s ei löydy\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:n Virhe: Kirjanmerkkitiedostoa %s ei voida avata: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP:n varoitus: Rivi %d ohitettu kirjanmerkkitiedostossa: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Varoitus: Rivillä %d ei ole tarpeeksi argumentteja\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 "
@@ -100,7 +107,7 @@ msgstr ""
 "vaadi välityspalvelimen käyttöä. Syntaksi: dont_use_proxy=.toimialue tai "
 "dont_use_proxy=verkko/maski"
 
-#: ../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"
@@ -109,52 +116,52 @@ msgstr ""
 "Huomautus: Kaikki vaihtoehdot tiedostopäätettä lukuunottamatta ovat "
 "valinnaisia."
 
-#: ../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 Virhe: Virheellinen konfigurointitiedoston nimi %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 virhe: Kansion %s luominen epäonnistui: %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 Virhe: Pääkonfigurointitiedostoa ei löydy %s \n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Oletko asentanut ohjelman komennolla \"make install\"?\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 Virhe: Konfigurointitiedoston %s avaaminen epäonnistui: %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 "Kesksytetään johtuen tulkintavirheistä asetustiedoston rivillä %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 Varoitus: Rivi %d ohitettu konfigurointitiedostossa: %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:n virhe: Virheellinen kirjautumistiedoston nimi %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 "gFTPn virhe: Tiedostoa %s ei voida avata kirjotettavaksi: %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"
@@ -163,7 +170,7 @@ msgstr ""
 "<masneyb gftp org>.Varoitus: kaikki kommentit, joita tähän tiedostoon "
 "lisätään, ylikirjoitetaan automaattisesti"
 
-#: ../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 "
@@ -175,104 +182,104 @@ msgstr ""
 "katsoa vierestä ja muistaa salasanoja, kun muokkaat tätä tiedostoa. Aiemmin "
 "salasanat oli talennettu selväkielisenä tekstinä."
 
-#: ../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:n asetustiedosto. Tekijänoikeudet (C) 1998-2007 Brian Masney <masney gftp "
-"org>Varoitus: Kaikki kommentit joita tähän tiedostoon lisätään, "
+"gFTP:n asetustiedosto. Tekijänoikeudet (C) 1998-2007 Brian Masney "
+"<masney gftp org>Varoitus: Kaikki kommentit joita tähän tiedostoon lisätään, "
 "ylikirjiotetaan automaattisesti. Jos asetus on merkitty merkillä (*), sitä "
 "ei voi muuttaa ohjelmasta käsin."
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:392 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: ../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 "VAKAVA gFTP:n virhe: Asetusta \"%s\" ei löydy hajautustaulusta\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Virhe: Tiedostoa %s ei voida viedä\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Virhe: Tiedostoon %s ei voida kirjoittaa: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Virhe: Virhe suljettaessa tiedostoa: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Epäkelpo tiedostolistaus FSP-palvelimelta %s\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1586
-#: ../lib/protocols.c:1587 ../lib/protocols.c:1628 ../lib/protocols.c:1629
-#: ../lib/protocols.c:1695 ../lib/protocols.c:1702 ../lib/protocols.c:1778
-#: ../lib/protocols.c:1779 ../lib/protocols.c:1815
+#: 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 "tuntematon"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP-kansion listausta %s ei voitu hakea: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Siirryttiin kansioon %s onnistuneesti\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kansioon %s ei voitu siirtyä\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Kohde %s poistettu\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Virhe: Kansiota %s ei voida poistaa: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Virhe: Tiedostoa %s ei voida poistaa: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Luotu kansio %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Kohde %s nimetty uudestaan nimelle %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Virhe: %s ei voida nimetä uudestaan nimelle %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"
@@ -280,7 +287,7 @@ msgstr ""
 "FTPS-tuki ei ole käytettävissä, koska SSL-tukea ei käännetty mukaan. Yhteys "
 "katkaistaan.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -288,109 +295,107 @@ msgstr ""
 "HTTPS-tuki ei ole käytettävissä, koska SSL-tukea ei käännetty mukaan. Yhteys "
 "katkaistaan.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Tämänhetkistä työhakemistoa ei löytynyt: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Paikallinen kansio vaihdettu: %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Paikalliseen kansioon %s ei voida vaihtaa: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Virhe: Paikallisen tiedoston %s lyhentäminen: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Paikallista kansiolistausta %s ei voitu avata: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Kohteen %s oikeudet vaihdettiin onnistuneesti arvoon %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Virhe: Kohteen %s oikeuksia ei voitu asettaa arvoon %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Muutettiin kohteen %s aikaleimaa onnistuneesti\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Virhe: Kohteen %s aikaleimaa ei voitu muuttaa: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "paikallinen tiedostojärjestelmä"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "käyttö: gftp"
 
 # The following items are the proxy types listed under the Options dialog
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "Ei välityspalvelinta"
 
 # The following few items are from the Edit Bookmarks dialog
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "tiedosto"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "koko"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "käyttäjä"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "ryhmä"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "aikaleima"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "ominaisuudet"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "laskeva"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "nouseva"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Yleistä"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Katseluohjelma:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -398,27 +403,27 @@ msgstr ""
 "Tiedostojen katseluun käytetty oletusohjelma. Jos arvo on tyhjä käytetään "
 "sisäistä katselinta"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Muokkausohjelma:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Tiedostojen muokkaamiseen käytettävä oletusohjelma."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Loki-ikkunan maksimikoko"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+-version loki-ikkunan maksimikoko tavuina"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Etäpalvelinten merkistöt:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -426,11 +431,11 @@ msgstr ""
 "Tämä on pilkuilla eroteltu lista merkistöjä, joiden avulla etäviestejä "
 "yritetään muuntaa paikalliseen merkistöön"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Etäpalvelimen LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -438,191 +443,194 @@ msgstr ""
 "Tämä on LC_TIME-muuttujan arvo etäpalvelimelle. Tämän muuttujan avulla "
 "palvelimen päiväykset voidaan esittää oikein hakemistolistauksissa."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Välimuistin TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Monenko sekunnin päästä välimuistin tiedot vanhenevat."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Lisää tiedostonsiirrot"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Lisää uudet tiedostonsiirrot olemassaoleviin"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Tee vain yksi siirto kerrallaan"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Siirretäänkö vain yksi tiedosto kerrallaan?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Ylikirjoita oletuksena"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Ylikirjoita tiedostot oletuksena tai aseta tiedostojen haun jatkaminen"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Säilytä tiedostojen oikeudet"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Säilytä siirrettyjen tiedostojen oikeudet"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Säilytä tiedostojen aikaleima"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Säilytä siirrettyjen tiedostojen aikaleimat"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Päivitä jokaisen siirron jälkeen"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Päivitä lista jokaisen siirretyn tiedoston jälkeen"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Järjestä kansiot ensin"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Näytä kansiot ennen tiedostoja"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Näytä piilotetut tiedostot"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Näytä piilotetut tiedostot listoissa"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Näytä siirron tila otsikossa"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Näytä tiedostojen siirron tila ikkunan nimessä"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Käynnistä tiedostojen siirto"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Aloita tiedostojen siirto automaattisesti kun ne laitetaan jonoon"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Salli kirjoitetut komennot graafisesta liittymästä"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Salli komentojen syöttäminen graafisesta käyttöliittymästä, esimerkiksi "
 "tekstin portti-funktiot"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Muista viimeisin kansio"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Tallenna viimeisin paikallinen ja etäkansio suljettaessa ohjelma"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Avaa yhteys palvelimeen käynnistettäessä"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
-msgstr ""
-"Yhdistä palvelimelle automaattisesti käynnistettäessä sovellusta."
+msgstr "Yhdistä palvelimelle automaattisesti käynnistettäessä sovellusta."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Verkko"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Verkon aikakatkaisu:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Aikakatkaisu verkkoliikenteen odottamiselle. Tämä on eri asia kuin "
 "joutilaana olon aikakatkaisu."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Uudelleenyrityksiä:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Kuinka monta kertaa yritetään automaattisesti uudestaan. Aseta arvoon 0, jos "
 "haluat yrittää ikuisesti"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Uudelleenyrityksen odotusaika:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Odotusaika uudelleenyritysten välillä"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max kt/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Suurin käytettävä siirtonopeus (kt/s). (Arvo 0 poistaa asetuksen käytöstä)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Siirron lohkokoko:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Tiedostojen siirrossa käytettävä lohkokoko. Tämän tulee olla luvun 1024 "
 "moninkerta."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Oletusprotokolla:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Valitsee oletuksena käytettävän protokollan"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Käytä IPv6-tukea"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -630,27 +638,27 @@ msgstr ""
 "Tämä määrittää mitä tapahtuu, kun kaksoisnapsautat tiedostoa listassa. "
 "0=Näytä tiedosto 1= Muokkaa tiedostoa 2=Siirrä tiedosto"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Paikallisten tiedostojen luetteloikkunan oletusleveys"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Palvelimella olevien tiedostojen luetteloikkunan oletusleveys"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Tiedostojen luetteloikkunoiden oletuskorkeus."
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Siirto-ikkunan oletuskorkeus"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Loki-ikkunan oletuskorkeus "
 
-#: ../lib/options.h:177
+#: 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."
@@ -658,15 +666,15 @@ msgstr ""
 "Tiedostonimi-sarakkeen leveys siirtoikkunassa. Aseta arvoksi 0, jos haluat "
 "sarakken koon muuttuvan automaattisesti."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Järjestykseen käytettävä oletussarake"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Nouseva vai laskeva järjestys"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -674,7 +682,7 @@ msgstr ""
 "Tiedostonimi-sarakkeen leveys tiedostolistaikkunoissa. Aseta arvoksi 0, jos "
 "haluat sarakken koon muuttuvan automaattisesti."
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -683,7 +691,7 @@ msgstr ""
 "sarakken koon muuttuvan automaattisesti. Aseta arvoksi -1, jos haluat "
 "piilottaa tämän sarakkeen."
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -692,7 +700,7 @@ msgstr ""
 "haluat sarakken koon muuttuvan automaattisesti. Aseta arvoksi -1, jos haluat "
 "piilottaa tämän sarakkeen."
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -701,7 +709,7 @@ msgstr ""
 "sarakken koon muuttuvan automaattisesti. Aseta arvoksi -1, jos haluat "
 "piilottaa tämän sarakkeen."
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,7 +718,7 @@ msgstr ""
 "haluat sarakken koon muuttuvan automaattisesti. Aseta arvoksi -1, jos haluat "
 "piilottaa tämän sarakkeen."
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -719,82 +727,75 @@ msgstr ""
 "haluat sarakken koon muuttuvan automaattisesti. Aseta arvoksi -1, jos haluat "
 "piilottaa tämän sarakkeen."
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Palvelimelle lähetettyjen komentojen väri"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Palvelimelta vastaanotettujen komentojen väri"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Virheviestien väri"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Muiden lokiviestien väri"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Paikallinen"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Kirjanmerkki"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:235
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Tiedostonsiirtonopeus rajataan arvoon %.2f Kt/s\n"
 
-#: ../lib/protocols.c:388
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Virhe asetettaessa LC_TIME arvoon \"%s\". Käytetään arvoa \"%s\"\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Ladataan kansiolistausta %s välimuistista (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:409
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Ladataan kansiolistausta %s palvelimelta (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:472
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Virhe muunnettaessa merkkijonoa '%s' merkistöstä %s merkistöön %s: %s\n"
-
-#: ../lib/protocols.c:699
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -803,169 +804,112 @@ msgstr ""
 "Varoitus: poistetaan polku tiedostonimestä \"%s\". Polku (%s) ei vastaa "
 "nykyistä hakemistoa (%s)\n"
 
-#: ../lib/protocols.c:730
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Virhe: Välimuistiin ei voida kirjoittaa: %s\n"
 
-#: ../lib/protocols.c:763
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Virhe: Kirjanmerkkiä %s ei löydy\n"
 
-#: ../lib/protocols.c:770
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Virhe kirjanmerkeissä: Kirjanmerkissä %s ei ole isäntänimeä\n"
 
-#: ../lib/protocols.c:892 ../lib/protocols.c:919
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokolla '%s' ei ole tuettu.\n"
 
-#: ../lib/protocols.c:1209 ../lib/protocols.c:1224 ../lib/protocols.c:2406
-#: ../lib/protocols.c:2519
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Etsitään nimeä %s\n"
-
-#: ../lib/protocols.c:1215 ../lib/protocols.c:1230 ../lib/protocols.c:2411
-#: ../lib/protocols.c:2524
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Isäntänimeä %s ei voida selvittää: %s\n"
-
-#: ../lib/protocols.c:2141
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Löytyi rekursiivinen symbolinen linkki %s\n"
 
-#: ../lib/protocols.c:2429
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Pistokkeen luominen epäonnistui: %s\n"
-
-#: ../lib/protocols.c:2435 ../lib/protocols.c:2541
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Yritetään %s: %d\n"
-
-#: ../lib/protocols.c:2440 ../lib/protocols.c:2548
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Yhteyttä kohteeseen %s ei voida avata: %s\n"
-
-#: ../lib/protocols.c:2478 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Virhe luotaessa IPv4-pistoketta: %s\n"
-
-#: ../lib/protocols.c:2502 ../lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "Palvelun nimeä %s/tcp ei löydy. Tarkista services-tiedostosi\n"
-
-#: ../lib/protocols.c:2564 ../lib/protocols.c:3218 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Virhe: \"Sulje suoritettaessa\"-lipun asetus ei onnistu: %s\n"
-
-#: ../lib/protocols.c:2571
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Yhteys avattu kohteeseen %s:%d\n"
-
-#: ../lib/protocols.c:2807 ../lib/protocols.c:2885 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Yhteys kohteeseen %s aikakatkaistu\n"
-
-#: ../lib/protocols.c:2955
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Pistokkeen lippujen arvoja ei voitu lukea: %s\n"
-
-#: ../lib/protocols.c:2969
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Pistoketta ei voitu asettaa non-blocking-tilaan: %s\n"
-
-#: ../lib/protocols.c:3115
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Virhe: Yhteys palvelimeen %s katkaistu. Maksimi määrä uusintayrityksiä "
 "täynnä...Lopetetaan\n"
 
-#: ../lib/protocols.c:3123
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Virhe: Yhteys palvelimeen %s katkaistu. Yritetään uudelleen %d sek. "
 "kuluttua\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Virhe: \"Sulje suoritettaessa\"-lipun asetus ei onnistu: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Päätelaitettä %s ei voitu avata: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Pistokeparia ei voitu luoda: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Virhe: Ohjelmaa ssh ei voitu suorittaa: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Virhe: Uutta prosessia ei voitu käynnnistää: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Välimuistin isäntänimi:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Palomuurin isäntänimi"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Välimuistin portti:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Palomuuriin yhteyttä avattaessa käytettävä portti"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Välimuistin käyttäjätunnus:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Käyttäjätunnuksesi palomuurin välimuistissa"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Välimuistin salasana:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Salasanasi palomuurin välimuistissa"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Käytä HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Käytetäänkö HTTP/1.1- vai HTTP/1.0-protokollaa"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -974,65 +918,65 @@ msgstr ""
 "Saatiin virheellinen vastaus palvelimelta, yhteys katkaistaan\n"
 "Palvelin ilmoitti virheellisen palasenkoon \"%s\"\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Katkaistaan yhteys palvelimeen %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Aloitetaan tiedostonsiirto kohdasta "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Tiedostoa %s ei voida hakea\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Noudetaan kansiolistausta...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Saatiin väärä vastaus palvelimelta, suljetaan yhteys\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE komento"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "käyttäjä kone"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "käyttäjä kone:Portti"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "Autentikointi"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "käyttäjä kone Portti"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "käyttäjä kone NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP välityspalvelin"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1040,19 +984,19 @@ msgstr ""
 "Tämä on salasana, joka lähetetään kun otat yhteyttä FTP-palvelimelle "
 "anonyyminä käyttäjänä"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Välityspalvelimen käyttäjätili:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Palomuurin käyttäjätili (ei pakollinen)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Välimuistin tyyppi:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1069,11 +1013,11 @@ msgstr ""
 "(salasana), h (verkkonimi), o (portti) tai a (tili). Voit esimerkiksi antaa "
 "välimuistin käyttäjän merkkijonolla %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Jätä huomioimatta PASV-osoite"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1085,11 +1029,11 @@ msgstr ""
 "tarvitaan esimerkiksi tapauksessa, jossa reititin antaa PASV-vastauksessa "
 "sisäisen IP-osoitteen ulkoisen sijasta."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passiivinen tiedostonsiirto"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1105,11 +1049,11 @@ msgstr ""
 "portin asiakkan puolelta ja etäpalvelin yrittää ottaa tähän porttiin "
 "yhteyttä."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Selvitä etäpalvelimen symboliset linkit (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1120,15 +1064,16 @@ msgstr ""
 "Yleensä tämä valitsin on hyvä jättää käyttöön. Tämä valitsin tulisi poistaa "
 "käytöstä vain silloin kun FTP-palvelin ei tue komennon LIST valitsinta -L"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Lähetä ASCII-tilassa"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1138,274 +1083,325 @@ msgstr ""
 "tämän asetuksen asettamatta. Jos haet binääritiedostja, tulee tämä jättää "
 "asettamatta."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Virheellinen vastaus '%c' palvelimelta.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Virhe luotaessa IPv4-pistoketta: %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-vastauksesta '%s' ei löydy IP-osoitetta\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 ""
 "Jätetään huomioimatta IP-osoite PASV-vastauksessa, otetaan yhteyttä "
 "osoitteeseen %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 "Data-yhteyttä ei voida luoda: %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 "Pistokkeen nimeä ei voida selvittää: %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 "Porttiin ei voida sitoa: %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 "Porttia %d ei voida kuunnella: %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6-pistokkeen luonti epäonnistui: %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 "Virhe: näyttää että yhteys ei ole IPv6-yhteys. Yhteys katkaistaan.\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 "Virheellinen EPSV-vastaus \"%s\"\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Paikallisen pistokkeen osoitetta ei löydy: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Yhteyttä palvelimelta ei voi hyväksyä: %s\n"
 
-#: ../lib/rfc959.c:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "kaikkiaan"
 
-#: ../lib/rfc959.c:1594
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Varoitus: Listaista %s ei voida tulkita\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Etsitään nimeä %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 "Isäntänimeä %s ei voida selvittää: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Pistokkeen luominen epäonnistui: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Yritetään %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 "Yhteyttä kohteeseen %s ei voida avata: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Yhteys avattu kohteeseen %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 "Palvelun nimeä %s/tcp ei löydy. Tarkista services-tiedostosi\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Yhteys kohteeseen %s aikakatkaistu\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Pistokkeen lippujen arvoja ei voitu lukea: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Pistoketta ei voitu asettaa non-blocking-tilaan: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSSH-ohjelman nimi:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Polku ohjelmaan SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH:n lisäparametrit:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Lisäparametrit annettavaksi SSH-komennolle"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Vaaditaan SSH käyttäjätunnus/salasana"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Vaadi käyttäjätunnus ja salasana  SSH-yhteyksille"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Suoritetaan ohjelma %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Anna salalause RSA-avaimelle"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Anna salalause avaimelle '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Salasana:"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "salasana"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(kyllä/ei)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Syötä tunnuskoodi:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Syötä salasana"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Syötä SecurID-salasana:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Virhe: Syötetty salasana oli virheellinen\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protokollan alustus\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokollan versio %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Avaa %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Sulje\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Avaa kansio %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Lue kansio\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Poista tiedosto %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Luo kansio %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Poista kansio %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Todellinen polku %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Tiedoston ominaisuudet\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Tiedostoa tai hakemistoa ei ole"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
 # The following few items are from the Edit Bookmarks dialog
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Epäonnistui"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Virheellinen viesti"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Ei yhteyttä"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Yhteys katkaistu"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Tuntematon toiminto"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Palvelin palautti tuntemattoman viestin"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Virhe: viestin koko %d on liian suuri\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Virhe: palvelimen palauttaman viestin koko %d on liian suuri\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1413,41 +1409,41 @@ msgstr ""
 "Virhe alustettaessa SSH-yhteyttä palvelimeen. Virheviesti palvelimelta oli "
 "seuraava:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Avataan SSH-yhteys palvelimelle %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Kirjauduttiin onnistuneesti SSH-palvelimelle %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-moottori"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL:n entropiatiedosto:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL:n entropiatiedosto"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropian syötteen pituus:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Enimmäismäärä tavuja, joilla SSL-moottorin entropia alustetaan"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Varmista SSL-kohde"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1460,11 +1456,11 @@ msgstr ""
 "Kohde = %s\n"
 "Virhe %i: %s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Vastapään varmennetta ei löydy\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 "
@@ -1473,55 +1469,45 @@ msgstr ""
 "VIRHE: palvelin SSL-varmenteessa (%s) ei ole sama kuin palvelin, johon "
 "yhteys otettiin (%s). Yhteys katkaistaan.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL-kirjastoa ei voitu alustaa\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Virhe ladattaessa SSL oletusvarmenteita\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Virhe alustettaessa cipher-listaa (ei kelvollisia ciphereitä)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Virhe: SSL-moottoria ei alustettu\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Virhe alustettaessa SSL-yhteyttä (BIO-olio)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Virhe alustettaessa SSL-yhteyttä (SSL-olio)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Virhe vastapään varmenteessa: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Toiminto peruttu\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Yhdistämistä yritetään uudestaan %d sek. kuluttua\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 ""
-">. Jos sinulla on kysymyksiä, kommentteja tai ehdotuksia tästä ohjelmasta, "
-"ole hyvä ja lähetä sähköpostia. Viimeisimmät uutiset löytyvät aina ohjelman "
-"kotisivulta osoitteesta http://www.gftp.org/\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 "
@@ -1532,76 +1518,76 @@ msgstr ""
 "edelleen tiettyjen ehtojen mukaisesti. Lisätietoja sekä ohjelman lisenssi "
 "löytyvät COPYING-tiedostosta.\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Suomentanut:Ilkka Tuohela, 2006\n"
 "\n"
 "http://www.gnome.fi/";
 
-#: ../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 "Virhe: Ei yhteyttä palvelimeen\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "käyttö: chmod <tila> <tiedosto>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "käyttö: rename <vanha nimi> <uusi nimi>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "käyttö: delete <tiedosto>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "käyttö: rmdir <kansio>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "käyttö site <palvelinkomento>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "käyttö: mkdir <uusi kansio>\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 "käyttö: chdir <kansio>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Virheellinen argumentti\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Tyhjennä kansiovälimuisti\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "käyttö: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "käyttö: set [muuttuja = arvo]\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 "Virhe: muuttuja %s ei ole kelvollinen asetusmuuttuja.\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 "Virhe: muuttuja %s ei ole käytettävissä gftp:n tekstiversiossa\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1609,325 +1595,324 @@ msgstr ""
 "Tuetut komennot:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "käyttö: %s <tiedostomäärittely>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "tietoja"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Näyttää tietoa gFTP:stä"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Asettaa tiedoston siirtotilaksi ASCII (vain FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Asettaa tiedoston siirtotilaksi binäärin (vain FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Vaihtaa kansiota etäpalvelimella"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Vaihtaa etäpalvelimen tiedoston oikeuksia"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "tyhjennä"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Käytettävät vaihtoehdot: välimuisti"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "sulje"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Katkaisee yhteyden etäpalvelimeen"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "poista"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Poistaa tiedoston etäpalvelimelta"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Näyttää etäpalvelimen kansion tiedostolistauksen"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Hae tiedostot"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "O_hje"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Näyttää ohjeikkunan"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Vaihtaa paikallista kansiota"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Muuttaa paikallisten tiedostojen oikeuksia"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Poistaa paikallisen tiedoston"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Näyttää paikallisen kansion tiedostolistauksen"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Luo paikallisen kansion"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Näyttää nykyisen paikallisen kansion"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Nimeä paikallinen tiedosto uudestaan"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Poista paikallinen kansio"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Luo kansion etäpalvelimelle"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Lähettää paikkallisia tiedostoja"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Avaa yhteyden palvelimelle"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Näytä nykyinen kansio etäpalvelimella"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Sulje gftp"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Nimeä tiedosto palvelimella uudestaan"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Poista kansio etäpalvelimelta"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Näytä asetusmuuttujia. Voit myös asettaa niiden arvoja komennolla set var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Suorita sijaintikohtainen komento"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Virhe: Komentoa ei tunnistettu\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Siirrettiin onnistuneesti %s nopeudella %.2f kt/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Ohitetaan tiedosto %s palvelimella %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Keskeytetään siirto palvelimella %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Tiedostoa %s ei voida hakea kohteesta %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"%d tiedostoa tai kansiota ei voitu siirtää. Tarkista lokista, mitä ei "
-"voitu siirtää."
+"%d tiedostoa tai kansiota ei voitu siirtää. Tarkista lokista, mitä ei voitu "
+"siirtää."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: paina pysäytyspainiketta ennen kuin teet mitään muuta\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Avaa kirjanmerkki"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Kirjanmerkin lisäys: kirjanmerkille täytyy antaa nimi\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Kirjanmerkin lisäys: kirjanmerkkiä %s ei voida lisätä, koska sen niminen "
 "kirjanmerkki on jo olemassa\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Lisää kirjanmerkki"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Kirjanmerkin lisäys: Isäntänimi täytyy antaa\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1938,31 +1923,31 @@ msgstr ""
 "valikkoon\n"
 "Esimerkki: Linux-sivut/Debian"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Kirjanmerkille täytyy antaa nimi."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Anna nimi kansiolle jonka haluat luoda"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Uusi kohta"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Anna luotavan kohteen nimi"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1971,109 +1956,102 @@ msgstr ""
 "Haluatko varmasti poistaa kirjanmerkin\n"
 "%s ja kaikki sen alla olevat kirjanmerkit?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Poista kirjanmerkki"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Muokkaa"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Koneen osoite:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Etäpalvelimen kansio:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Paikallinen kansio:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Kirjaudu sisään nimettömänä"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Peruuta  "
-
 # The following few items are from the Edit Bookmarks dialog
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "_Tiedosto"
 
 # Keep the english word tearoff in here 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "Uusi kansio..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "Uusi _kohta... "
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "_Poista"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "_Ominaisuudet..."
 
 # Keep the english word sep in here
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "_Sulje"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Muokkaa kirjanmerkkejä"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2082,93 +2060,92 @@ msgstr ""
 "Huom: Kaikki FTP-palvelimet eivät tue tätä ominaisuutta."
 
 # This is the column header under chmod for SUID and SGID
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Yleiset"
 
 # Set user id
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
 # Set group id
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Luku"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Kirjoitus"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Suoritus"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Muut"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Haluatko varmasti poistaa nämä %ld tiedostoa ja %ld kansiota"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Haluatko varmasti poistaa nämä %ld tiedostoa"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Haluatko varmasti poistaa nämä %ld kansiota"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Poista tiedostoja tai kansioita"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Saatiin URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Drag-N-Drop"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Lopeta"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2176,469 +2153,456 @@ msgstr ""
 "Tiedostonsiirtoja on vielä käynnissä.\n"
 "Oletko varma, että haluat poistua ohjelmasta?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Avaa sijainti"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Syötä URL, johon otetaan yhteyttä"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "Ikkuna _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "Ikkuna _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "_Binääri"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "_Ominaisuudet..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "_Lopeta"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Paikalliset"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Paikalliset/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "_Avaa _sijainti..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "_Katkaise yhteys"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "Muuta _tiedostomäärityksiä..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "Näytä _valitut"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "Valitse k_aikki"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "Valitse kaikki tiedostot"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "Kumoa valinnat"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "Tallenna kansiolistaus..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "lähetä SITE-komento..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "Vaihda _kansiota"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "_Oikeudet..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "Uusi _kansio..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "Nimeä _uudelleen..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "_Poista..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "_Muokkaa..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "_Näytä..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "_Päivitä"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/P_alvelin"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "Avaa _sijanti..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "_Katkaise yhteys"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "Vaihda tiedostomäärittelyjä..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "_Näytä valitut"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "Valitse k_aikki"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "Valitse kaikki tiedostot"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "Kumoa valinnat"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "Tallenna kansiolistaus..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "lähetä SITE-komento..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "Vaihda _kansiota"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "_Oikeudet..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "Uusi _kansio..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "Nimeä _uudelleen..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "_Poista..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "_Muokkaa..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "_Näytä..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "_Päivitä"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "_Kirjanmerkit"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "Lisää _kirjanmerkki"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "_Muokkaa kirjanmerkkejä"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "S_iirrot"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "_Aloita"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "_Lopeta"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "Ohita _tämänhetkinen tiedosto"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "_Poista tiedosto"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "Siirrä tiedostoa _ylöspäin"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "Siirrä tiedostoa _alaspäin"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "_Hae tiedostoja"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "_Vie tiedostoja"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "_Loki"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "_Tyhjennä"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "_Näytä"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "_Tallenna..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/T_yökalut"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "_Vertaile ikkunoita"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "_Tyhjennä välimuisti"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "O_hje"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "_Tietoja"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Palvelin: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Palvelin: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Portti: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Käyttäjätunnus: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Käyttäjätunnus: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Salasana: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komento: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atribuutit"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Edistyminen"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 "Virhe: Sinun on annettava palvelimen nimi, jotta yhteys voidaan luoda.\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Anna käyttäjätunnus"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Anna käyttäjätunnuksesi tälle palvelimelle"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Anna salasanasi tälle palvelimelle"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Toiminto keskeytetty: sinun täytyy syöttää merkkijono\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Luo kansion"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Anna luotavan kansion nimi"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Nimeä uudestaan"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Minkä haluat antaa %s uudeksi nimeksi?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Palvelinkomento"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Syötä palvelinkohtainen komento"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Lisää eteen SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Ohitettu"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Ylikirjoita"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Yritä uudestaan"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Ohita"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Toimenpide"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Tiedostojen siirto"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2646,59 +2610,59 @@ msgstr ""
 "Seuraavat tiedostot ovat olemassa sekä paikallisesti että palvelimessa\n"
 "Valitse toimenpide"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Ohita tiedosto"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Kumoa valinnat"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Muuta tiedostomääritystä: toiminto keskeytetty, syötä merkkijono\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Muuta tiedostomäärittelyä"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Syötä uusi tiedostomäärittely"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Virhe: Tiedostoa %s ei voi avata kirjoitettavaksi: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Tallenna hakemistolistaus"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Virhe: Virhe kirjoitettaessa tiedostoon %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Lokitiedosto kirjoitettu onnistuneesti tiedostoon %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Tallenna loki"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2707,11 +2671,11 @@ msgstr ""
 "Lisenssisopimuksen tiedostoa COPYING ei löydy. Tarkista että se on joko "
 "paikassa %s tai %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Tietoja gFTPstä"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2722,27 +2686,23 @@ msgstr ""
 "Tekijänoikeudet (©) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Virallinen kotisivu: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Tietoja"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Sulje  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Vertaile ikkunoita"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Katkaise yhteys palvelimeen"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2750,72 +2710,56 @@ msgstr ""
 "Yhdistä palvelinmäärittelyssä mainittuun palvelimeen. Jos palvelinta ei ole "
 "annettu, voit syöttää URLin näytettävään ikkunaan."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (välimuistissa) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Ei yhteyttä"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Virhe avattaessa tiedostoa %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ei yhteyttä palvelimeen\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Tämä ominaisuus ei ole käytettävissä tällä protokollalla\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Vain yksi kohta voi olla valittuna\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Vähintään yksi kohta täytyy olla valittuna\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Muuta"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Lisää"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Kyllä  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Ei  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Nodetaan tiedostolistausta"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "   Pysäytä   "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2824,109 +2768,89 @@ msgstr ""
 "Noudettu %ld kansio\n"
 "ja %ld tiedostoa"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Virhe: Tiedostoa %s ei löydy paikoista %s tai %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Muokkaa palvelinta"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Lisää palvelin"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Aluenimi"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Verkko-osoite"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Verkko-osoite:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Verkkopeite"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "V_erkkopeite:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Aluenimi:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Verkkopeite"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Paikalliset palvelimet"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Käytä"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Vastaanotetaan tiedostolistausta..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Tiedostojen haku: ei yhteyttä etäpalvelimelle\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Virhe: Lapsiprosessi %d palautti arvon %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Lapsiprosessi %d päättyi onnistuneesti\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Virhe: Lapsiprosessi %d ei päättynyt onnistuneesti\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Virhe: Tietoja tiedostosta %s ei voida hakea: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Tiedost %s ei ole muuttunut\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2935,118 +2859,166 @@ msgstr ""
 "Tiedosto %s on muuttunut.\n"
 "Haluatko siirtää sen palvelimelle?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Muokkaa tiedostoa"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Lähetetty %s/%s nopeudella %.2fkt/s, %02d:%02d:%02d aikaa jäljellä"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Noudettu %s/%s nopeudella %.2fkt/s, %02d:%02d:%02d aikaa jäljellä"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Lähetetty %s/%s, haku pysähtynyt, jäljellä oleva aika tuntematon"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Noudettu %s/%s, haku pysähtynyt, jäljellä oleva aika tuntematon"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Tuntematon määrä siirretty. (Tiedosto %ld/%ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% valmiina, %02d:%02d:%02d aikaa jäljellä (tiedost %ld/%ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Nodetaan tiedostojen nimiä... %s tavua"
 
-#: ../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
+#: 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 "Tiedostonsiirtoja ei ole valittu\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Näyttö"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Näyttö: %s on kansio eikä sitä voida näyttää.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Muokkaus: %s on kansio eikä sitä voida muokata.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Muokkaus: muokkain täytyy määritellä asetuksissa\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Näyttö: Uutta prosessia ei voitu käynnistä: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Suoritetaan ohjelma: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Avataan %s ohjelmalla %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Näytetään tiedostoa %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Näyttö: Tiedoston %s avaaminen epäonnistui: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Ohjaavaa päätettä  %s ei voida avata\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Käyttäjätunnus: [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s on jo olemassa. (%s lähdekoko, %s kohdekoko):\n"
 "ylikirjoita (o), jatka (r), ohita (s), ylikirjoita kaikki (O),\n"
 "jatka kaikkia (R) tai ohita kaikki (S): (%c)"
 
+#~ 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 ""
+#~ ">. Jos sinulla on kysymyksiä, kommentteja tai ehdotuksia tästä "
+#~ "ohjelmasta, ole hyvä ja lähetä sähköpostia. Viimeisimmät uutiset löytyvät "
+#~ "aina ohjelman kotisivulta osoitteesta http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Peruuta  "
+
+#~ msgid "Host: "
+#~ msgstr "Palvelin: "
+
+#~ msgid "User: "
+#~ msgstr "Käyttäjätunnus: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Sulje  "
+
+#~ msgid "Add"
+#~ msgstr "Lisää"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Kyllä  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ei  "
+
+#~ msgid "Type:"
+#~ msgstr "Tyyppi:"
+
+#~ msgid "Network Address"
+#~ msgstr "Verkko-osoite"
+
+#~ msgid "_Edit"
+#~ msgstr "_Muokkaa"
+
+#~ msgid "Apply"
+#~ msgstr "Käytä"
+
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr ""
 #~ "Virhe muunnettaessa merkkijonoa \"%s\" UTF-8 muotoon nykyisestä "
diff --git a/po/fr.po b/po/fr.po
index 033c329..c083ddc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,93 +13,101 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 2.0.19pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-27 21:05+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-04-10 00:21+0100\n"
 "Last-Translator: Jonathan Ernst <jonathan ernstfamily ch>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL non valide %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Erreur : ligne %s non valide dans le fichier d'index du cache\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Erreur : impossible de créer le répertoire %s : %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Erreur : impossible de créer le fichier temporaire %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Erreur de fermeture du descripteur de fichiers : %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Erreur : impossible de se positionner dans le fichier %s : %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3205
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Erreur de conversion de la chaîne « %s » depuis le jeu de caractères %s au "
+"jeu de caractères %s : %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Erreur : impossible d'ouvrir le fichier local %s : %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2906 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Erreur : impossible d'écrire sur le socket : %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2828 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Erreur : impossible de lire depuis le socket : %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 "Erreur gFTP : mauvais nom du fichier de signets %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 "Avertissement : impossible de trouver le fichier principal des signets %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 "Erreur gFTP : impossible d'ouvrir le fichier des signets %s : %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Avertissement gFTP : ligne %d ignorée dans le fichier des signets : %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 "Avertissement gFTP : la ligne %d ne possède pas suffisament d'arguments\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 "
@@ -109,7 +117,7 @@ msgstr ""
 "besoin de passer au travers du serveur proxy (si disponible). Syntaxe : "
 "dont_use_proxy=.domaine ou dont_use_proxy=adresse/masque de réseau"
 
-#: ../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"
@@ -118,57 +126,57 @@ msgstr ""
 "visualisation. Note : tous les arguments, sauf l'extension du fichier, sont "
 "facultatifs"
 
-#: ../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 "Erreur gFTP : mauvais nom du fichier de configuration %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 "Erreur gFTP : impossible de créer le répertoire %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 ""
-"Erreur gFTP : impossible de trouver le fichier principal de configuration %"
-"s\n"
+"Erreur gFTP : impossible de trouver le fichier principal de configuration "
+"%s\n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Avez-vous fait un 'make install' ?\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 ""
 "Erreur gFTP : impossible d'ouvrir le fichier de configuration %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 ""
 "Fin à cause d'erreurs d'analyse à la ligne %d du fichier de configuration\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 ""
 "Avertissement gFTP : ligne %d ignorée dans le fichier de configuration : %s\n"
 
-#: ../lib/config_file.c:672
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Erreur gFTP : mauvais nom du fichier d'historique %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 "Avertissement gFTP : impossible d'ouvrir %s en écriture %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"
@@ -177,7 +185,7 @@ msgstr ""
 "<masneyb gftp org>. Attention : les commentaires que vous ajouterez à ce "
 "fichier SERONT écrasés."
 
-#: ../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 "
@@ -190,7 +198,7 @@ msgstr ""
 "vous éditez ce fichier. Avant ceci, tous les mots de passe étaient stockés "
 "en texte brut."
 
-#: ../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. "
@@ -201,94 +209,95 @@ msgstr ""
 "fichier SERONT écrasés. Si un enregistrement a un (*) dans son commentaire, "
 "vous ne pouvez pas le changer à partir de la fenêtre de gFTP."
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:391 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: ../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 ""
 "Erreur FATALE gFTP : l'option de configuration « %s » n'a pas été trouvée "
 "dans la table de hash globale\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Erreur : impossible d'envoyer le fichier %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Erreur : impossible d'écrire dans le fichier %s : %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Erreur : erreur lors de la fermeture du fichier : %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Liste de fichiers corrompue sur le serveur FSP %s\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1583
-#: ../lib/protocols.c:1584 ../lib/protocols.c:1625 ../lib/protocols.c:1626
-#: ../lib/protocols.c:1692 ../lib/protocols.c:1699 ../lib/protocols.c:1775
-#: ../lib/protocols.c:1776 ../lib/protocols.c:1812
+#: 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 "inconnu"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Impossible d'obtenir le contenu du répertoire du serveur FSP %s : %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Changement réussi du répertoire vers %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Impossible de changer de répertoire vers %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Suppression réussie de %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Erreur : impossible de supprimer le répertoire %s : %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Erreur : impossible de supprimer le fichier %s : %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Création réussie du répertoire %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Changement de nom réussi de %s en %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Erreur : impossible de renommer %s en %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"
@@ -296,7 +305,7 @@ msgstr ""
 "Le support FTPS n'est pas disponible car le support SSL n'a pas été activé "
 "lors de la compilation. Abandon.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -304,108 +313,106 @@ msgstr ""
 "Le support HTTPS n'est pas disponible car le support SSL n'a pas été activé "
 "lors de la compilation. Abandon.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Impossible d'obtenir le répertoire courant de travail : %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Changement réussi du répertoire local vers %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Impossible de changer de répertoire local vers %s : %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Erreur : impossible de tronquer le fichier local %s : %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Impossible d'obtenir le contenu du répertoire local %s : %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Changement de mode réussi de %s en %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Erreur : impossible de changer le mode de %s en %o : %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Changement réussi de l'horodatage de %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Erreur : impossible de changer l'horodatage de %s : %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "Système de fichiers local"
 
-#: ../lib/misc.c:407
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "usage : gftp "
 
 # The following items are the proxy types listed under the Options dialog
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "aucun"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fichier"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "taille"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "propriétaire"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "groupe"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "date et heure"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "permissions"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "décroissant"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "croissant"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Général"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programme de visualisation :"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -413,28 +420,28 @@ msgstr ""
 "Le programme par défaut de visualisation de fichiers. Si rien n'est indiqué, "
 "le programme interne de visualisation sera utilisé"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programme d'édition :"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Le programme d'édition de fichiers par défaut."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Taille Maxi de la fenêtre de Log :"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "Taille maximale en octets de la fenêtre du Journal de Bord pour le port GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Jeux de caractères distants :"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -442,11 +449,11 @@ msgstr ""
 "C'est une liste de jeux de caractères séparés par des virgules depuis "
 "lesquels essayer de convertir les messages distants dans la locale courante"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME distant :"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -454,199 +461,203 @@ msgstr ""
 "Ceci est la valeur de LC_TIME pour les sites distants. De sorte que les "
 "dates puissent être analysées proprement dans les listes de répertoires."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL :"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Le nombre de secondes qu'il faut conserver les entrées dans le cache avant "
 "qu'elles n'expirent."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Ajouter à la fin les nouveaux tranferts"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Ajout d'un nouveau fichier à transférer à la liste"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Un seul transfert à la fois"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Autoriser qu'un seul transfert à la fois ?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Écraser par défaut"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Écrase les fichiers par défaut ou continue les transfert de fichiers"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Préserver les permissions de fichiers"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Préserve les permissions des fichiers transférés"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Préserver l'heure des fichiers"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Préserve l'heure des fichiers transférés"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Rafraîchir après chaque transfert"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Rafraîchir les fenêtres des fichiers après chaque transfert"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Classer d'abord les répertoires"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 "Placer les répertoires avant les fichiers dans les fenêtres de fichiers "
 "« Local » et « Distant »"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Afficher les fichiers cachés"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Afficher les fichiers cachés dans les fenêtres de fichiers"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Afficher l'état du transfert dans le titre"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Afficher l'état du transfert dans la barre de titre"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Démarrer les transferts de fichiers"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Démarrer automatiquement le transfert de fichiers, dès qu'ils sont ajoutés "
 "dans la file ?"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permettre des commandes manuelles dans l'interface graphique"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permettre la saisie de commandes manuelles depuis le GUI (fonctions comme le "
 "port de texte)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Se souvenir du dernier répertoire"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Enregistre le dernier répertoire local et distant en quittant l'application"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Se connecter au serveur distant au démarrage"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Se connecte automatiquement au serveur distant au démarrage de l'application."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Réseau"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Délai d'attente :"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Le délai d'attente des communications réseaux. Ce n'est PAS le délai "
 "d'inactivité du réseau."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Tentatives de connexion :"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Nombre de tentatives de reconnexion automatique. Mettre la valeur à 0 pour "
 "réessayer indéfiniment"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Délai entre tentatives :"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Délai d'attente, en secondes, entre deux tentatives de connexion"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Débit Maxi. (ko/s) :"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Débit maximun, en ko/s, autorisé pour le transfert de fichiers. (Mettre la "
 "valeur à 0 pour désactiver)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Taille des blocs de transfert :"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "La taille du bloc qui est utilisé quand les fichiers sont transférés. Cela "
 "devrait être un multiple de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocole par défaut :"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ceci spécifie le protocole par défaut à utiliser"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activer le support de l'IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -655,27 +666,27 @@ msgstr ""
 "0=Voir le fichier 1=Éditer le fichier 2=Transférer le fichier"
 
 # Je suis pas trop sûr de la traduction
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Largeur par défaut de la fenêtre des fichiers locaux"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Largeur par défaut de la fenêtre des fichiers distants (Hôte)"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Hauteur par défaut de la fenêtre des fichiers locaux et distants"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Hauteur par défaut de la fenêtre de transfert des fichiers"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Hauteur par défaut de la fenêtre de Journal de Bord"
 
-#: ../lib/options.h:177
+#: 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."
@@ -684,15 +695,15 @@ msgstr ""
 "mettre à 0 pour qu'elle se redimensionne automatiquement. Mettre cette "
 "valeur à -1 pour la désactiver."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "La colonne de tri par défaut"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Tri croissant ou décroissant"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -701,7 +712,7 @@ msgstr ""
 "mettre à 0 pour qu'elle se redimensionne automatiquement. Mettre cette "
 "valeur à -1 pour la désactiver"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,7 +721,7 @@ msgstr ""
 "0 pour qu'elle se redimensionne automatiquement. Mettre cette valeur à -1 "
 "pour la désactiver"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -719,7 +730,7 @@ msgstr ""
 "mettre à 0 pour qu'elle se redimensionne automatiquement. Mettre cette "
 "valeur à -1 pour la désactiver"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -728,7 +739,7 @@ msgstr ""
 "0 pour qu'elle se redimensionne automatiquement. Mettre cette valeur à -1 "
 "pour la désactiver"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -737,7 +748,7 @@ msgstr ""
 "pour qu'elle se redimensionne automatiquement. Mettre cette valeur à -1 pour "
 "la désactiver"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -746,83 +757,75 @@ msgstr ""
 "mettre à 0 pour qu'elle se redimensionne automatiquement. Mettre cette "
 "valeur à -1 pour la désactiver"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "La couleur des commandes envoyées au serveur"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "La couleur des commandes reçues du serveur"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "La couleur des messages d'erreurs"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "La couleur des autres messages du journal de bord"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Signet"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:234
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Le transfert de fichiers sera effectué à %.2f KB/s\n"
 
-#: ../lib/protocols.c:387
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Erreur lors de la configuration  LC_TIME to « %s ». Retour à « %s »\n"
 
-#: ../lib/protocols.c:398
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Chargement du répertoire %s depuis le cache  (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:408
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Chargement du répertoire %s depuis le serveur  (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:471
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Erreur de conversion de la chaîne « %s » depuis le jeu de caractères %s au "
-"jeu de caractères %s : %s\n"
-
-#: ../lib/protocols.c:696
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -831,173 +834,114 @@ msgstr ""
 "Attention : coupure du chemin du fichier « %s ». Le chemin coupé (%s) ne "
 "correspond pas au répertoire local (%s)\n"
 
-#: ../lib/protocols.c:727
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Erreur : impossible d'écrire dans le cache : %s\n"
 
-#: ../lib/protocols.c:760
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Erreur : impossible d'écrire sur le socket : %s\n"
 
-#: ../lib/protocols.c:767
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Erreur de signet : %s Assurez-vous d'avoir indiqué un nom d'hôte et "
 "d'utilisateur.\n"
 
-#: ../lib/protocols.c:889 ../lib/protocols.c:916
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Le protocole « %s » n'est actuellement pas supporté.\n"
 
-#: ../lib/protocols.c:1206 ../lib/protocols.c:1221 ../lib/protocols.c:2403
-#: ../lib/protocols.c:2516
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Recherche de %s\n"
-
-#: ../lib/protocols.c:1212 ../lib/protocols.c:1227 ../lib/protocols.c:2408
-#: ../lib/protocols.c:2521
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Impossible de trouver l'hôte %s : %s\n"
-
-#: ../lib/protocols.c:2138
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Lien symbolique récursif trouvé : %s\n"
 
-#: ../lib/protocols.c:2426
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Échec de création d'un socket : %s\n"
-
-#: ../lib/protocols.c:2432 ../lib/protocols.c:2538
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Essai avec %s:%d\n"
-
-#: ../lib/protocols.c:2437 ../lib/protocols.c:2545
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Impossible de se connecter à %s : %s\n"
-
-#: ../lib/protocols.c:2475 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "La création d'un socket IPv4 a échoué : %s\n"
-
-#: ../lib/protocols.c:2499 ../lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-"Impossible de résoudre le nom du service %s/tcp. Veuillez vérifier votre "
-"fichier de services (/etc/services)\n"
-
-#: ../lib/protocols.c:2561 ../lib/protocols.c:3214 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr ""
-"Erreur : impossible de définir la fermeture sur le drapeau d'exécution : %s\n"
-
-#: ../lib/protocols.c:2568
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Connecté sur %s:%d\n"
-
-#: ../lib/protocols.c:2804 ../lib/protocols.c:2881 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Connexion sur %s échouée\n"
-
-#: ../lib/protocols.c:2951
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Impossible d'obtenir les drapeaux du socket : %s\n"
-
-#: ../lib/protocols.c:2965
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Impossible de rendre le socket non bloquant : %s\n"
-
-#: ../lib/protocols.c:3111
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Erreur : hôte distant %s déconnecté. Nombre maximun de tentatives atteint... "
 "abandon\n"
 
-#: ../lib/protocols.c:3119
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Erreur : hôte distant %s déconnecté. Nouvelle tentative dans %d secondes\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 ""
+"Erreur : impossible de définir la fermeture sur le drapeau d'exécution : %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Impossible d'ouvrir un pty maître %s : %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "La création d'un socket a échoué : %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Erreur : impossible d'exécuter ssh : %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Impossible de cloner un autre processus : %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nom d'hôte du proxy :"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nom d'hôte du pare-feu"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port du proxy :"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port pour se connecter au pare-feu"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nom d'utilisateur sur le proxy :"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Votre nom d'utilisateur sur le pare-feu"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Mot de passe sur le proxy :"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Votre mot de passe sur le pare-feu"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Utiliser HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Voulez-vous utiliser HTTP/1.1 ou HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -1006,65 +950,65 @@ msgstr ""
 "Réception d'une réponse incorrecte du serveur, déconnexion\n"
 "Taille de chunk « %s » non valide retournée par le serveur distant\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Déconnexion de l'hôte %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Démarrage du transfert de fichiers à partir de l'offset "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Impossible de récupérer le fichier %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Rapatriement de la liste des répertoires...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Réception d'une réponse incorrecte du serveur, déconnexion\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Commande SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "utilisateur hôte"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "utilisateur hôte:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTIFIER"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "utilisateur hôte port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "utilisateur hôte NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1072,19 +1016,19 @@ msgstr ""
 "C'est le mot de passe qui sera utilisé lorsque que vous vous connecterez à "
 "un serveur FTP distant en anonymous"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Compte sur le proxy :"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Votre compte sur le pare-feu (facultatif)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Type de serveur proxy :"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1101,11 +1045,11 @@ msgstr ""
 "un u (utilisateur), o (port) ou a (compte). Par exemple, pour spécifier "
 "l'utilisateur du proxy vous pouvez saisir %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorer l'adresse PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1117,11 +1061,11 @@ msgstr ""
 "souvent requis pour les routeurs qui donne leur adresse IP interne plutot "
 "que leur adresse IP externe en réponse à une requête PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transfert de fichiers en mode passif"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1137,11 +1081,11 @@ msgstr ""
 "supporte pas. Si c'est désactivé, alors gFTP ouvrira un port côté client et "
 "le serveur distant tentera de s'y connecter."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Résoudre les liens symboliques distants (LIST -l)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1153,15 +1097,16 @@ msgstr ""
 "activé. Les seules fois ou vous devriez le désactiver est lorsque le serveur "
 "FTP distant ne supporte pas l'option -L à LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transférer les fichiers en mode ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1171,277 +1116,330 @@ msgstr ""
 "alors il est préférable de laisser cette option désactivé. Si vous "
 "téléchargez des données binaires, alors vous devez le désactiver."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Réponse « %c » non valide reçue du serveur.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "La création d'un socket IPv4 a échoué : %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Impossible de trouver une adresse IP dans la réponse PASV « %s »\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 "Ignore l'adresse IP de la réponse PASV, connexion à %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 "Impossible de créer une connexion : %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 "Impossible d'obtenir le nom du socket : %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 "Impossible de se connecter à un port : %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 "Impossible d'écouter sur le port %d : %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "La création d'un socket IPv6 a échoué : %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 ""
 "Erreur : il ne semble pas que vous soyez connecté en IPv6. Abandon de la "
 "connexion.\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 "Réponse EPSV non valide « %s »\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Impossible d'obtenir l'adresse d'un socket local : %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Impossible d'accepter de connexion à partir du serveur: %s\n"
 
-#: ../lib/rfc959.c:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1594
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Attention : impossible d'analyser le listing %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Recherche de %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 "Impossible de trouver l'hôte %s : %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Échec de création d'un socket : %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Essai avec %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 "Impossible de se connecter à %s : %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Connecté sur %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 ""
+"Impossible de résoudre le nom du service %s/tcp. Veuillez vérifier votre "
+"fichier de services (/etc/services)\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Connexion sur %s échouée\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Impossible d'obtenir les drapeaux du socket : %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Impossible de rendre le socket non bloquant : %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nom du programme SSH :"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Chemin vers l'exécutable SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Paramètres supplémentaires SSH :"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Paramètres supplémentaires à passer au programme SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Utiliser SSH User/Pass"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Nécessite un <nom utilisateur>/<mot de passe> pour les connexions SSH."
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Exécution du programme %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Saisissez la phrase de passe pour la clé RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Saisissez la phrase de passe pour la clé « "
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "mot de passe"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(oui/non) ?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Saisissez PASSCODE :"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Saisissez le mot de passe SecurID :"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Erreur : Un mot de passe incorrect a été saisi\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d : Initialisation du protocole\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d : Version du protocole %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d : Ouverture de %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d : Fermeture\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d : Ouverture du répertoire %s\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d : Lecture du contenu du répertoire\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d : Effacement du fichier %s\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d : Création du répertoire %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d : Suppression du répertoire %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d : Chemin réel %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d : Attributs du fichier\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d : stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d : chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d : utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Valider"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Fichier ou répertoire inéxistant"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permission refusée"
 
 # The following few items are from the Edit Bookmarks dialog
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Échec"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mauvais message"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Non connecté"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Connexion à l'hôte perdue"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Opération non prise en charge"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Message du serveur inconnu"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Erreur : message trop grand (%d)\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Erreur : taille %d du message trop grande reçue du serveur\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1449,41 +1447,41 @@ msgstr ""
 "Il y a eu une erreur à l'initialisation de la connexion SSH avec le serveur "
 "distant. Le message d'erreur du serveur distant suit :\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Ouverture d'une connexion SSH vers %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Connexion réussie au serveur SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Moteur SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Fichier d'entropie SSL :"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Fichier d'entropie SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Longueur du germe d'entropie :"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Le nombre maximum d'octets pour initier le moteur SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Vérification du pair SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1496,11 +1494,11 @@ msgstr ""
 "Sujet = %s\n"
 "Erreur %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Impossible d'obtenir le certificat du pair\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 "
@@ -1509,57 +1507,46 @@ msgstr ""
 "ERREUR : l'hôte du certificat SSL (%s) ne correspond pas à l'hôte auquel on "
 "se connecte (%s). Abandon de la connexion.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Impossible d'initialiser la bibliothèque OpenSSL\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Erreur lors du chargement des certificats SSL par défaut\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "Erreur lors de la définition de la liste de ciphers (aucun cipher valide)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Erreur : le moteur SSL n'est pas initialisé\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Erreur lors du paramètrage de la connexion SSL (objet BIO)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Erreur lors du paramètrage de la connexion SSL (objet SSL)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Erreur avec le certificat pair : %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Opération annulée\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Pause de %d secondes avant la prochaine tentative.\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 ""
-">. Si vous avez des questions, commentaires ou suggestions sur ce programme, "
-"n'hésitez pas à me les envoyer par courriel.  Vous pouvez trouver les "
-"dernières informations concernant gFTP sur mon site web à l'adresse http://";
-"www.gftp.org/\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 "
@@ -1570,7 +1557,7 @@ msgstr ""
 "redistribuer sous certaines conditions ; pour avoir des détails, lisez le "
 "fichier COPYING.\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Traduction française par :\n"
@@ -1581,71 +1568,71 @@ msgstr ""
 "Damien Durand <splinux fedoraproject org>\n"
 "Jonathan Ernst <jonathan ernstfamily ch>"
 
-#: ../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 "Erreur : non connecté à un site distant\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "usage : chmod <mode> <fichier>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "usage : rename <ancien nom> <nouveau nom>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "usage : delete <fichier>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "usage : rmdir <répertoire>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "usage : site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "usage : mkdir <nouveau répertoire>\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 "usage : chdir <répertoire>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argument non valide\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Vide le cache des répertoires\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "usage: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "usage: set [variable = valeur]\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 ""
 "Erreur : la variable %s n'est pas une variable de configuration valide.\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 ""
 "Erreur : la variable %s n'est pas disponible dans le port texte de gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1653,287 +1640,287 @@ msgstr ""
 "Commandes supportées :\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "usage : %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Affiche les informations concernant gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Définit le mode de transfert ASCII (seulement pour FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Définit le mode de transfert BINAIRE (seulement pour FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Modifie le répertoire de travail distant"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Modifier les permissions d'un fichier distant"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Options disponibles : cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Déconnecter du serveur distant"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Supprime un fichier distant"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Affiche le contenu du répertoire distant courant"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Télécharge les fichiers distants"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Affiche cet écran d'aide"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Change de répertoire de travail local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Modifie les permissions d'un fichier local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Supprime un fichier local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "lldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Affiche le contenu du répertoire de travail local"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crée un répertoire local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Affiche le répertoire local courant"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renomme un fichier local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Supprime un répertoire local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crée un répertoire distant"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Envoye les fichiers locaux"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Ouvre une connexion vers un site distant"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Affiche le répertoire distant courant"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Quitter gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renomme un fichier distant"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Supprime un répertoire distant"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Afficher les variables du fichier de configuration. Vous pouvez aussi "
 "définir les variables par set variable = valeur"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Lancer une commande SITE spécifique"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Erreur : commande non reconnue\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Transfert réussi de %s à %.2f ko/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Saute le fichier %s sur l'hôte %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Arrêt du transfert sur l'hôte %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Impossible de télécharger %s de %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1943,37 +1930,36 @@ msgstr ""
 "liste des éléments qui n'ont pas pu être correctement transférés dans le "
 "journal."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s : veuillez cliquer d'abord sur le bouton Stop\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Lancer le signet"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Ajout de signet : vous devez saisir un nom pour ce signet.\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Ajout de signet : impossible d'ajouter le signet %s, car ce nom existe "
 "déjà.\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Ajouter un signet"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Ajout de signet : vous devez saisir un nom d'hôte\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1983,31 +1969,31 @@ msgstr ""
 "Vous pouvez séparer les mots par un / pour le mettre dans un sous-menu.\n"
 "(ex : Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Se souvenir du mot de passe"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Vous devez saisir un nom pour ce signet."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Saisissez le nom du nouveau dossier à créer"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nouvel élément"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Saisissez le nom du nouveau signet à créer"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -2016,110 +2002,103 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer le signet\n"
 "%s et tous ses fils ?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Suppression du signet"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Éditez l'entrée"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Description :"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nom de l'hôte :"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port :"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Répertoire de l'hôte distant :"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Répertoire local :"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Compte :"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Se connecter en tant qu'ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Annuler  "
-
 # The following few items are from the Edit Bookmarks dialog
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fichier"
 
 # Keep the english word tearoff in here
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fichier/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fichier/Nouveau _dossier..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fichier/Nouveau _objet..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fichier/_Supprimer"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fichier/_Propriétés..."
 
 # Keep the english word sep in here
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fichier/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fichier/_Fermer"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Édition des signets"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Modifiez les permissions"
 
 # Utilisé pour les messages d'alerte
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2129,94 +2108,93 @@ msgstr ""
 "des permissions (Chmod)."
 
 # This is the column header under chmod for SUID and SGID
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Spécial"
 
 # Set user id
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
 # Set group id
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Propriétaire"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lecture"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Écriture"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Exécution"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:791
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Autre"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer ces %ld fichier(s) et %ld répertoire(s) ?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Êtes-vous sûr de vouloir supprimer ces %ld fichiers ?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Êtes-vous sûr de vouloir supprimer ces %ld répertoires ?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Suppression de fichiers/répertoires"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Réception de l'URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Drag-N-Drop"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Quitter"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2224,469 +2202,456 @@ msgstr ""
 "Des fichiers sont en cours de transfert.\n"
 "Êtes-vous sûr de vouloir quitter ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Ouvrir un emplacement"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Saisissez l'URL du site FTP sur lequel se connecter"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Fenêtre _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Fenêtre _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binaire"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Préférences..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Quitter"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Ouvrir un emplacement..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/_Déconnecter"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Changer le _filtre..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Afficher la sélection"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/_Tout sélectionner"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Sélectionner tous les fichiers"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Tout désélectionner"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Enregistrer la liste des fichiers..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Envoyer une commande SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Changer de répertoire"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Fichier/_Nouveau dossier..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/_Renommer..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Supprimer..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/É_diter..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Afficher..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Rafraîchir"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Distant"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Distant/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Distant/Ouvrir un _emplacement..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Distant/_Déconnecter"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Distant/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Distant/Changer le _filtre..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Distant/_Afficher la sélection"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Distant/_Tout sélectionner"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Distant/Sélectionner tous les fichiers"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Distant/Tout désélectionner"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Distant/Enregistrer la liste des fichiers..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Distant/Envoyer une commande SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Distant/_Changer de répertoire"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Distant/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Fichier/_Nouveau dossier..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Distant/_Renommer..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Distant/_Supprimer..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Distant/É_diter..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Distant/_Afficher..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Distant/_Rafraîchir"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Signets"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Signets/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Signets/_Ajouter un signet"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Signets/Éditer les signets"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Signets/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferts"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferts/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferts/_Démarrer"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferts/_Arrêter"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferts/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferts/_Sauter le fichier en cours"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferts/_Supprimer le fichier"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferts/Déplacer le fichier vers le _haut"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferts/Déplacer le fichier vers le _bas"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferts/_Télécharger le(s) fichier(s)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferts/_Envoyer le(s) fichier(s)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Journal de bord"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Journal de bord/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Journal de bord/_Effacer"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Journal de bord/_Afficher"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Journal de bord/_Enregistrer..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Outils"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Outils/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Outils/_Comparer les fenêtres"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Outils/_Vider le cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Aide"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Aide/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Aide/À _propos"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Hôte : "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Hôte : "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port : "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Utilisateur : "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Utilisateur : "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Mot de passe : "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Commande : "
 
-#: ../src/gtk/gftp-gtk.c:788 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../src/gtk/gftp-gtk.c:789
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Taille"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Date"
 
-#: ../src/gtk/gftp-gtk.c:793
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Permissions"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "En cours"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Erreur : vous devez saisir un nom d'hôte pour la connexion\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Saisissez le nom d'utilisateur :"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Saisissez votre nom d'utilisateur pour ce site"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Saisissez un mot de passe pour ce site"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Opération annulée... vous devez saisir une chaîne de caractères\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Créer un répertoire"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Créez un répertoire"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Saisissez le nom du répertoire à créer"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Comment voulez-vous renommer %s ?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Commande SITE"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Saisissez une commande SITE spécifique"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Ajouter à SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Changer de répertoire"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Sauté"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "En attente..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Continuer"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Sauter"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Action"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transférer les fichiers"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2694,61 +2659,61 @@ msgstr ""
 "Le(s) fichier(s) suivant(s) existe(nt) localement et sur l'hôte.\n"
 "Choisissez ce que vous voulez faire :"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Sauter fichier"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Tout désélectionner"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Changer le filtre : opération annulée... vous devez saisir une chaîne de "
 "caractères\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Changer le filtre"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Saisissez le nouveau masque de filtrage"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Erreur : impossible d'ouvrir %s en écriture : %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Enregistrer la liste des fichiers du répertoire courant"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Erreur : erreur lors de l'écriture sur %s : %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Écriture réussie du journal de bord dans %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Sauvegarder le journal de bord"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2757,11 +2722,11 @@ msgstr ""
 "Impossible de trouver le fichier de licence COPYING. Assurez-vous qu'il est "
 "dans %s ou %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "À propos de gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2772,27 +2737,23 @@ msgstr ""
 "Copyright  (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Page officielle : http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "À propos"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licence"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Fermer  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparer les fenêtres"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Se déconnecter du serveur distant"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2800,72 +2761,56 @@ msgstr ""
 "Se connecter au site spécifié dans l'entrée hôte. Si l'entrée hôte est vide, "
 "alors une boîte de dialogue sera affichée vous autorisant à saisir une URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Mémoire-Cache) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Non connecté"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Erreur lors de l'ouverture du fichier %s : %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s : non connecté sur un site distant\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s : cette caractéristique n'est pas disponible avec ce protocole\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s : vous devez sélectionner un seul objet\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s : vous devez sélectionner au moins un objet\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Modifier"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Oui  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Non  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Rapatriement de la liste des répertoires"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2874,109 +2819,89 @@ msgstr ""
 "Réception de %ld répertoires\n"
 "et %ld fichiers"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Erreur gFTP : impossible de trouver le fichier %s dans %s ou %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Édition de l'hôte"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Ajouter un hôte"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Type :"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adresse du réseau"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Adresse du réseau :"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Masque de réseau"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "_Masque de réseau :"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domaine :"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Masque de réseau"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Hôtes locaux"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Éditer"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "É_diter"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Options"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Appliquer"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Réception des noms de fichiers..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Connexion en cours..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Télécharger les fichiers : non connecté sur un hôte distant\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Erreur : le processus enfant %d a retourné %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Le processus enfant %d a été lancé correctement\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Erreur : le processus enfant %d ne s'est pas terminé correctement\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Erreur : impossible d'obtenir d'information sur le fichier %s : %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Le fichier %s n'a pas été changé.\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2985,116 +2910,165 @@ msgstr ""
 "Le fichier %s a changé.\n"
 "Voulez-vous synchroniser le fichier distant ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Éditer fichier"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Terminé"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Envoyé %s sur %s à %.2f ko/s, temps restant estimé %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Reçu %s sur %s à %.2f ko/s, temps restant estimé %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Envoyé %s sur %s, transfert bloqué, temps restant indeterminé"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Reçu %s sur %s, transfert bloqué, temps restant indeterminé"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Pourcentage effectué inconnu. (File %ld sur %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% effectué, temps restant estimé %02d:%02d:%02d. (Fichier %ld sur %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Rapatriement des noms de fichiers... %s octets"
 
-#: ../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
+#: 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 "Il n'y a aucun transfert de fichiers sélectionné\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Voir"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Éditer"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Voir : %s est un répertoire. Il ne peut pas être visualisé.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Éditer : %s est un répertoire. Il ne peut pas être visualisé.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 "Éditer : vous devez spécifier un éditeur dans la fenêtre des options.\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Voir : impossible de créer un processus fils : %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Exécution du programme : %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Ouverture de %s avec %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Visualisation du fichier %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Voir : impossible d'ouvrir le fichier %s : %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Impossible d'ouvrir le terminal de contrôle %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nom d'utilisateur [anonymous] :"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s existe déjà. (taille de la source %s, taille de la destination %s) :\n"
 "écraser(o), continue(r), (s)auter, tout écraser(O), tout continue(R), tout "
 "(S)auter : (%c)"
+
+#~ 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 ""
+#~ ">. Si vous avez des questions, commentaires ou suggestions sur ce "
+#~ "programme, n'hésitez pas à me les envoyer par courriel.  Vous pouvez "
+#~ "trouver les dernières informations concernant gFTP sur mon site web à "
+#~ "l'adresse http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Annuler  "
+
+#~ msgid "Host: "
+#~ msgstr "Hôte : "
+
+#~ msgid "User: "
+#~ msgstr "Utilisateur : "
+
+#~ msgid "  Close  "
+#~ msgstr "  Fermer  "
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Oui  "
+
+#~ msgid "  No  "
+#~ msgstr "  Non  "
+
+#~ msgid "Type:"
+#~ msgstr "Type :"
+
+#~ msgid "Network Address"
+#~ msgstr "Adresse du réseau"
+
+#~ msgid "_Edit"
+#~ msgstr "É_diter"
+
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
diff --git a/po/ga.po b/po/ga.po
index fda2584..9c242a3 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-17 03:34+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-02-02 08:10+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry computer org>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL Neabhailí %s\n"
@@ -25,131 +26,140 @@ msgstr "URL Neabhailí %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr ""
 
-#: lib/cache.c:137 lib/local.c:534
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr ""
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:265 lib/sshv2.c:1000
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr ""
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 ""
 
-#: lib/config_file.c:117 lib/config_file.c:124 lib/protocols.c:2634
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:134 lib/protocols.c:2346 lib/sslcommon.c:467
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr ""
 
-#: lib/config_file.c:142 lib/protocols.c:2274 lib/sslcommon.c:421
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr ""
 
-#: lib/config_file.c:174 lib/config_file.c:730
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:183
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 
-#: lib/config_file.c:194 lib/config_file.c:736
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:286 lib/config_file.c:308
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:338
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: lib/config_file.c:499
+#: 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 ""
 
-#: lib/config_file.c:502
+#: 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:580 lib/config_file.c:818
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:591
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:601
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 
-#: lib/config_file.c:603
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr ""
 
-#: lib/config_file.c:612 lib/config_file.c:824
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:651
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:657
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:664
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:670
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: lib/config_file.c:725
+#: lib/config_file.c:732
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:726
+#: 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 "
@@ -157,582 +167,666 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: lib/config_file.c:831
+#: lib/config_file.c:845
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:1190 lib/rfc2068.c:565 lib/rfc2068.c:566
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr ""
 
-#: lib/config_file.c:1266 lib/config_file.c:1327 lib/config_file.c:1368
-#: lib/config_file.c:1400
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
+#: lib/fsp.c:189
+#, c-format
+msgid "Error: Cannot upload file %s\n"
 msgstr ""
 
-#: lib/local.c:67 lib/local.c:464
+#: lib/fsp.c:199
 #, c-format
-msgid "Could not change local directory to %s: %s\n"
+msgid "Error: Cannot write to file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:81 lib/local.c:449
+#: lib/fsp.c:237
 #, c-format
-msgid "Could not get current working directory: %s\n"
+msgid "Error: Error closing file: %s\n"
 msgstr ""
 
-#: lib/local.c:179
+#: lib/fsp.c:327
 #, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr ""
+
+#: 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 "gan fhois"
+
+#: lib/fsp.c:377
+#, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr ""
 
-#: lib/local.c:404
+#: lib/fsp.c:436
 #, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Successfully changed directory to %s\n"
 msgstr ""
 
-#: lib/local.c:441
+#: lib/fsp.c:446
 #, c-format
-msgid "Successfully changed local directory to %s\n"
+msgid "Could not change directory to %s\n"
 msgstr ""
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:918
-#: src/gtk/view_dialog.c:302
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr ""
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr ""
 
-#: lib/local.c:510 src/gtk/transfer.c:922 src/gtk/view_dialog.c:306
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr ""
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: lib/local.c:560
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/local.c:583
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
+#, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr ""
+
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr ""
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr ""
+
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr ""
+
+#: lib/local.c:424
+#, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr ""
+
+#: lib/local.c:634
+#, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr ""
+
+#: lib/local.c:641
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: lib/local.c:590
+#: lib/local.c:676
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Successfully changed the time stamp of %s\n"
 msgstr ""
 
 #: lib/local.c:683
+#, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr ""
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr ""
 
-#: lib/misc.c:411
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
 msgstr ""
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr ""
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr ""
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr ""
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr ""
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr ""
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr ""
 
-#: lib/options.h:38
+#: 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:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr ""
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr ""
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr ""
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr ""
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Taisceán TTL:"
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr ""
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr ""
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr ""
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
 msgstr ""
 
-#: lib/options.h:75
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr ""
+
+#: lib/options.h:85
+msgid "Preserve file times of transferred files"
+msgstr ""
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr ""
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+msgid "Refresh the listbox after each file is transferred"
 msgstr ""
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr ""
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr ""
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: lib/options.h:88
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr ""
 
-#: lib/options.h:90
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr ""
 
-#: lib/options.h:92 src/gtk/options_dialog.c:1050
-#: src/gtk/options_dialog.c:1143
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr ""
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr ""
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr ""
 
-#: lib/options.h:94
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: lib/options.h:97
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:99
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: lib/options.h:102
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: lib/options.h:104
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:107
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: lib/options.h:108
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: lib/options.h:111
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:114
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr ""
 
-#: lib/options.h:116
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: lib/options.h:118 lib/options.h:121
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr ""
 
-#: lib/options.h:126
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:129
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: lib/options.h:135
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:138
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:141
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: lib/options.h:144
+#: 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 ""
 
-#: lib/options.h:148 lib/options.h:154
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: lib/options.h:151 lib/options.h:157
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:170 lib/options.h:188
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:173 lib/options.h:191
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:176 lib/options.h:194
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:197
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: lib/options.h:200
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: lib/options.h:203
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr ""
 
-#: lib/options.h:206
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: lib/options.h:212 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr ""
 
-#: lib/options.h:213 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr ""
 
-#: lib/options.h:215 lib/options.h:217
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr ""
 
-#: lib/options.h:219
+#: lib/options.h:270
 msgid "Local"
 msgstr "Áitiúl"
 
-#: lib/options.h:220
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:221 src/gtk/bookmarks.c:858
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "L.marc"
 
-#: lib/protocols.c:219
-#, c-format
-msgid "File transfer will be throttled to %.2f KB/s\n"
+#: lib/options.h:275
+msgid "FSP"
 msgstr ""
 
-#: lib/protocols.c:327
+#: lib/protocols.c:226
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:543
+#: lib/protocols.c:379
 #, c-format
-msgid "Error: Cannot write to cache: %s\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:575
+#: lib/protocols.c:390
 #, c-format
-msgid "Error: Could not find bookmark %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:582
+#: lib/protocols.c:400
 #, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:690
+#: lib/protocols.c:450
 #, c-format
-msgid "The protocol '%s' is currently not supported.\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:1033 lib/protocols.c:1048 lib/protocols.c:1871
-#: lib/protocols.c:1980
+#: lib/protocols.c:481
 #, c-format
-msgid "Looking up %s\n"
+msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: lib/protocols.c:1039 lib/protocols.c:1054 lib/protocols.c:1876
-#: lib/protocols.c:1985
+#: lib/protocols.c:514
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
+msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: lib/protocols.c:1311 lib/protocols.c:1312 lib/protocols.c:1371
-#: lib/protocols.c:1378 lib/protocols.c:1457 lib/protocols.c:1458
-#: lib/protocols.c:1492
-msgid "unknown"
-msgstr "gan fhois"
-
-#: lib/protocols.c:1894
+#: lib/protocols.c:521
 #, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1900 lib/protocols.c:1999
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Trying %s:%d\n"
+msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:1905 lib/protocols.c:2006
+#: lib/protocols.c:1153
 #, c-format
-msgid "Cannot connect to %s: %s\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: lib/protocols.c:1937 lib/rfc959.c:625
+#: lib/protocols.c:1531
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: lib/protocols.c:1961 lib/sshv2.c:898
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:2023 lib/protocols.c:2643 lib/rfc959.c:634 lib/rfc959.c:781
+#: lib/protocols.c:1634 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 ""
 
-#: lib/protocols.c:2030
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr ""
-
-#: lib/protocols.c:2254 lib/protocols.c:2325
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: lib/protocols.c:2394
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2408
+#: lib/pty.c:301
 #, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2537
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: lib/protocols.c:2545
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: lib/pty.c:288
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr ""
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
@@ -744,100 +838,90 @@ msgstr ""
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:154 lib/rfc2068.c:863
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:260 lib/rfc959.c:594 lib/sshv2.c:995
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:310
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr ""
-
-#: lib/rfc2068.c:318
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: lib/rfc2068.c:340
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:439 lib/sshv2.c:1080
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: lib/rfc2068.c:844 lib/sshv2.c:716 lib/sshv2.c:729 lib/sshv2.c:751
-#: lib/sshv2.c:819 lib/sshv2.c:951 lib/sshv2.c:1042 lib/sshv2.c:1110
-#: lib/sshv2.c:1223 lib/sshv2.c:1236 lib/sshv2.c:1249 lib/sshv2.c:1262
-#: lib/sshv2.c:1318 lib/sshv2.c:1383 lib/sshv2.c:1843 lib/sshv2.c:1946
-#: lib/sshv2.c:2040 lib/sshv2.c:2125 lib/sshv2.c:2211
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "úsáideoir óst"
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr ""
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr ""
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -848,11 +932,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -862,11 +958,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -874,83 +970,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr ""
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:325 lib/rfc959.c:334 lib/rfc959.c:345
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
+#, c-format
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Failed to create a IPv4 socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:663 lib/rfc959.c:673
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:688 lib/rfc959.c:843
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:700 lib/rfc959.c:721 lib/rfc959.c:868
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:711 lib/rfc959.c:858
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:730 lib/rfc959.c:877
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:772
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:792
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:821 lib/rfc959.c:830
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:887
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:960
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1467
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "iomlán"
 
-#: lib/rfc959.c:1469
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -971,198 +1128,190 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr ""
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr ""
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "Ag rith roghchlár %s\n"
 
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr ""
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Pasfhocal:"
 
-#: lib/sshv2.c:259
-#, c-format
-msgid "Running program %s\n"
-msgstr "Ag rith roghchlár %s\n"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Pasfhocal:"
 
-#: lib/sshv2.c:306 lib/sshv2.c:331
-msgid "WARNING"
-msgstr "RABHADH"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr ""
 
-#: lib/sshv2.c:373
-msgid "Error: An incorrect password was entered\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
 
-#: lib/sshv2.c:376
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
 msgstr ""
 
-#: lib/sshv2.c:379
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:519
+msgid "Enter SecurID Password:"
+msgstr ""
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: lib/sshv2.c:418
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:424
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:433
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Oscail %s\n"
 
-#: lib/sshv2.c:438
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Dún\n"
 
-#: lib/sshv2.c:444
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Oscail Eolaire %s\n"
 
-#: lib/sshv2.c:449
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:453
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:458
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:463
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:468
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:473
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:477
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:494
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:499
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:512 src/gtk/bookmarks.c:1017 src/gtk/bookmarks.c:1254
-#: src/gtk/chmod_dialog.c:282 src/gtk/options_dialog.c:1108
-#: src/gtk/options_dialog.c:1310 src/gtk/transfer.c:2080
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr ""
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr ""
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: lib/sshv2.c:539
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: lib/sshv2.c:576
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:634 lib/sshv2.c:1119 lib/sshv2.c:1955 lib/sshv2.c:2049
-#: lib/sshv2.c:2137
+#: 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 ""
 
-#: lib/sshv2.c:640
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:869
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: lib/sshv2.c:962
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
@@ -1187,7 +1336,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1196,1442 +1349,1486 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:919 src/gtk/menu-items.c:58
-#: src/gtk/menu-items.c:88 src/gtk/misc-gtk.c:495 src/gtk/misc-gtk.c:503
-#, c-format
-msgid "%s: Please hit the stop button first to do anything else\n"
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:40
-msgid "Run Bookmark"
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:70
-msgid "Add Bookmark: You must enter a name for the bookmark\n"
+#: 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 ""
 
-#: src/gtk/bookmarks.c:77
-#, c-format
-msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
 msgstr ""
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
-msgid "Add Bookmark"
+#: 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 ""
 
-#: src/gtk/bookmarks.c:141
-msgid "Add Bookmark: You must enter a hostname\n"
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:145
-msgid ""
-"Enter the name of the bookmark you want to add\n"
-"You can separate items by a / to put it into a submenu\n"
-"(ex: Linux Sites/Debian)"
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:145
-msgid "Remember password"
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
-msgid "New Folder"
-msgstr "Fillteán Nua"
-
-#: src/gtk/bookmarks.c:472
-msgid "Enter the name of the new folder to create"
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:482
-msgid "Enter the name of the new item to create"
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:555
-#, c-format
-msgid ""
-"Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:556
-msgid "Delete Bookmark"
-msgstr "Dealaigh Leabharmarc"
-
-#: src/gtk/bookmarks.c:583
-msgid "Bookmarks"
-msgstr "L.Marcanna"
-
-#: src/gtk/bookmarks.c:823 src/gtk/bookmarks.c:826
-msgid "Edit Entry"
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:863
-msgid "Description:"
-msgstr "Tuarascail:"
-
-#: src/gtk/bookmarks.c:878
-msgid "Hostname:"
-msgstr "Óstainm:"
-
-#: src/gtk/bookmarks.c:891
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gtk/bookmarks.c:908
-msgid "Protocol:"
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:932
-msgid "Remote Directory:"
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:945
-msgid "Local Directory:"
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
 msgstr ""
 
-#: src/gtk/bookmarks.c:962
-msgid "Username:"
-msgstr "Úsáideoir:"
-
-#: src/gtk/bookmarks.c:975
-msgid "Password:"
-msgstr "Pasfhocal:"
-
-#: src/gtk/bookmarks.c:989
-msgid "Account:"
-msgstr "Cúntas:"
-
-#: src/gtk/bookmarks.c:1003
-msgid "Log in as ANONYMOUS"
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1029 src/gtk/bookmarks.c:1264
-#: src/gtk/chmod_dialog.c:294 src/gtk/options_dialog.c:1119
-#: src/gtk/options_dialog.c:1321 src/gtk/transfer.c:2092
-msgid "  Cancel  "
-msgstr "  Cealaigh "
-
-#: src/gtk/bookmarks.c:1039 src/gtk/options_dialog.c:1332
-msgid "Apply"
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1181
-msgid "/_File"
-msgstr "/_Comhad"
-
-#: src/gtk/bookmarks.c:1182
-msgid "/File/tearoff"
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1183
-msgid "/File/New Folder..."
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1184
-msgid "/File/New Item..."
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1185
-msgid "/File/Delete"
+#: src/uicommon/gftpui.c:937
+msgid "about"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1186
-msgid "/File/Properties..."
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1187
-msgid "/File/sep"
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1188
-msgid "/File/Close"
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1199 src/gtk/bookmarks.c:1202
-msgid "Edit Bookmarks"
+#: src/uicommon/gftpui.c:941
+msgid "binary"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:74 src/gtk/delete_dialog.c:89
-#: src/gtk/menu-items.c:426 src/gtk/mkdir_dialog.c:59
-#: src/gtk/rename_dialog.c:60 src/gtk/transfer.c:539
-msgid "Operation canceled\n"
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:160 src/gtk/chmod_dialog.c:166
-#: src/gtk/chmod_dialog.c:171
-msgid "Chmod"
+#: src/uicommon/gftpui.c:943
+msgid "cd"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:191
-msgid ""
-"You can now adjust the attributes of your file(s)\n"
-"Note: Not all ftp servers support the chmod feature"
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:201
-msgid "Special"
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:209
-msgid "SUID"
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:213
-msgid "SGID"
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:217
-msgid "Sticky"
+#: src/uicommon/gftpui.c:949
+msgid "clear"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:221 src/gtk/gftp-gtk.c:607
-msgid "User"
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:229 src/gtk/chmod_dialog.c:249
-#: src/gtk/chmod_dialog.c:269
-msgid "Read"
-msgstr "Leámh"
-
-#: src/gtk/chmod_dialog.c:233 src/gtk/chmod_dialog.c:253
-#: src/gtk/chmod_dialog.c:273
-msgid "Write"
-msgstr "Scríobh"
-
-#: src/gtk/chmod_dialog.c:237 src/gtk/chmod_dialog.c:257
-#: src/gtk/chmod_dialog.c:277
-msgid "Execute"
-msgstr "Deán"
-
-#: src/gtk/chmod_dialog.c:241 src/gtk/gftp-gtk.c:608
-msgid "Group"
-msgstr "Grúpa"
-
-#: src/gtk/chmod_dialog.c:261
-msgid "Other"
-msgstr "Eile"
-
-#: src/gtk/delete_dialog.c:156
-#, c-format
-msgid "Are you sure you want to delete these %ld files and %ld directories"
+#: src/uicommon/gftpui.c:951
+msgid "close"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:158
-msgid "Delete Files/Directories"
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1193
-msgid "Delete"
-msgstr "Dealaigh"
-
-#: src/gtk/dnd.c:128 src/gtk/dnd.c:213
-msgid "Drag-N-Drop"
+#: src/uicommon/gftpui.c:953
+msgid "delete"
 msgstr ""
 
-#: src/gtk/dnd.c:234
-#, c-format
-msgid "Received URL %s\n"
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:116
-msgid "Exit"
-msgstr "Ealu"
-
-#: src/gtk/gftp-gtk.c:116
-msgid ""
-"There are file transfers in progress.\n"
-"Are you sure you want to exit?"
+#: src/uicommon/gftpui.c:955
+msgid "dir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/_FTP"
-msgstr "/F_TP"
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/tearoff"
+#: src/uicommon/gftpui.c:957
+msgid "get"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:164
-msgid "/FTP/Window 1"
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Window 2"
+#: src/uicommon/gftpui.c:959
+msgid "help"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:166 src/gtk/gftp-gtk.c:169 src/gtk/gftp-gtk.c:172
-msgid "/FTP/sep"
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:167
-msgid "/FTP/Ascii"
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/Binary"
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:170
-msgid "/FTP/_Options..."
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:173
-msgid "/FTP/_Quit"
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/_Local"
-msgstr "/_Áitiúl"
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr ""
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/tearoff"
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:176
-msgid "/Local/Open _URL..."
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Disconnect"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:178 src/gtk/gftp-gtk.c:184
-msgid "/Local/sep"
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Change Filespec..."
+#: src/uicommon/gftpui.c:971
+msgid "lls"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:180
-msgid "/Local/Show selected"
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:181
-msgid "/Local/Select All"
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:182
-msgid "/Local/Select All Files"
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:183
-msgid "/Local/Deselect All"
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Save Directory Listing..."
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Send SITE Command..."
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Change Directory"
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Chmod..."
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Make Directory..."
+#: src/uicommon/gftpui.c:981
+msgid "ls"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Rename..."
+#: src/uicommon/gftpui.c:983
+msgid "mget"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/Delete..."
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Edit..."
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:193
-msgid "/Local/View..."
+#: src/uicommon/gftpui.c:987
+msgid "mput"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:194
-msgid "/Local/Refresh"
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/_Remote"
+#: src/uicommon/gftpui.c:989
+msgid "open"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:196
-msgid "/Remote/tearoff"
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Open _URL..."
+#: src/uicommon/gftpui.c:991
+msgid "put"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:199
-msgid "/Remote/Disconnect"
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:201 src/gtk/gftp-gtk.c:207
-msgid "/Remote/sep"
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Change Filespec..."
+#: src/uicommon/gftpui.c:995
+msgid "quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:203
-msgid "/Remote/Show selected"
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:204
-msgid "/Remote/Select All"
+#: src/uicommon/gftpui.c:997
+msgid "rename"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:205
-msgid "/Remote/Select All Files"
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:206
-msgid "/Remote/Deselect All"
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Save Directory Listing..."
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Send SITE Command..."
+#: src/uicommon/gftpui.c:1001
+msgid "set"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Change Directory"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Chmod..."
+#: src/uicommon/gftpui.c:1004
+msgid "site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Make Directory..."
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Rename..."
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/Delete..."
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Edit..."
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:216
-msgid "/Remote/View..."
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:217
-msgid "/Remote/Refresh"
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/_Bookmarks"
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:219
-msgid "/Bookmarks/tearoff"
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
+#, c-format
+msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/bookmarks.c:41
+msgid "Run Bookmark"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/bookmarks.c:71
+msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Bookmarks/sep"
+#: src/gtk/bookmarks.c:78
+#, c-format
+msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/_Transfers"
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
+msgid "Add Bookmark"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/tearoff"
+#: src/gtk/bookmarks.c:142
+msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:226
-msgid "/Transfers/Start Transfer"
+#: src/gtk/bookmarks.c:146
+msgid ""
+"Enter the name of the bookmark you want to add\n"
+"You can separate items by a / to put it into a submenu\n"
+"(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:227
-msgid "/Transfers/Stop Transfer"
+#: src/gtk/bookmarks.c:146
+msgid "Remember password"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:229 src/gtk/gftp-gtk.c:237
-msgid "/Transfers/sep"
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:230
-msgid "/Transfers/Skip Current File"
+#: src/gtk/bookmarks.c:463
+msgid "New Folder"
+msgstr "Fillteán Nua"
+
+#: src/gtk/bookmarks.c:464
+msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Remove File"
+#: src/gtk/bookmarks.c:473
+msgid "New Item"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Up"
+#: src/gtk/bookmarks.c:474
+msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Transfers/Move File _Down"
+#: src/gtk/bookmarks.c:547
+#, c-format
+msgid ""
+"Are you sure you want to erase the bookmark\n"
+"%s and all its children?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/bookmarks.c:548
+msgid "Delete Bookmark"
+msgstr "Dealaigh Leabharmarc"
+
+#: src/gtk/bookmarks.c:620
+msgid "Bookmarks"
+msgstr "L.Marcanna"
+
+#: src/gtk/bookmarks.c:825
+msgid "Edit Entry"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Transfers/Put Files"
+#: src/gtk/bookmarks.c:860
+msgid "Description:"
+msgstr "Tuarascail:"
+
+#: src/gtk/bookmarks.c:875
+msgid "Hostname:"
+msgstr "Óstainm:"
+
+#: src/gtk/bookmarks.c:888
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gtk/bookmarks.c:905
+msgid "Protocol:"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/L_ogging"
+#: src/gtk/bookmarks.c:929
+msgid "Remote Directory:"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/tearoff"
+#: src/gtk/bookmarks.c:942
+msgid "Local Directory:"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Clear"
+#: src/gtk/bookmarks.c:959
+msgid "Username:"
+msgstr "Úsáideoir:"
+
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
+msgid "Password:"
+msgstr "Pasfhocal:"
+
+#: src/gtk/bookmarks.c:986
+msgid "Account:"
+msgstr "Cúntas:"
+
+#: src/gtk/bookmarks.c:1000
+msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:243
-msgid "/Logging/View log..."
+#: src/gtk/bookmarks.c:1154
+msgid "/_File"
+msgstr "/_Comhad"
+
+#: src/gtk/bookmarks.c:1155
+msgid "/File/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Logging/Save log..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
+msgstr "Fillteán Nua"
+
+#: src/gtk/bookmarks.c:1157
+msgid "/File/New _Item..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tool_s"
-msgstr "/Uirli_sí"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
+msgstr "Dealaigh"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/tearoff"
+#: src/gtk/bookmarks.c:1159
+msgid "/File/_Properties..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/Tools/Compare Windows"
+#: src/gtk/bookmarks.c:1160
+msgid "/File/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Tools/Clear Cache"
+#: src/gtk/bookmarks.c:1161
+msgid "/File/_Close"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/_Help"
-msgstr "/C_uidiú"
+#: src/gtk/bookmarks.c:1173
+msgid "Edit Bookmarks"
+msgstr ""
 
-#: src/gtk/gftp-gtk.c:250
-msgid "/Help/tearoff"
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
+msgid "Chmod"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:251
-msgid "/Help/About..."
+#: src/gtk/chmod_dialog.c:152
+msgid ""
+"You can now adjust the attributes of your file(s)\n"
+"Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:369
-msgid "Host: "
+#: src/gtk/chmod_dialog.c:162
+msgid "Special"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:387
-msgid "Port: "
+#: src/gtk/chmod_dialog.c:170
+msgid "SUID"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:405
-msgid "User: "
+#: src/gtk/chmod_dialog.c:174
+msgid "SGID"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:423
-msgid "Pass: "
+#: src/gtk/chmod_dialog.c:178
+msgid "Sticky"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:605 src/gtk/gftp-gtk.c:809 src/gtk/transfer.c:1928
-msgid "Filename"
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
+msgid "User"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:606
-msgid "Size"
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
+msgid "Read"
+msgstr "Leámh"
+
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
+msgid "Write"
+msgstr "Scríobh"
+
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
+msgid "Execute"
+msgstr "Deán"
+
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
+msgid "Group"
+msgstr "Grúpa"
+
+#: src/gtk/chmod_dialog.c:222
+msgid "Other"
+msgstr "Eile"
+
+#: src/gtk/delete_dialog.c:61
+#, c-format
+msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:609
-msgid "Date"
+#: src/gtk/delete_dialog.c:65
+#, c-format
+msgid "Are you sure you want to delete these %ld files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:610
-msgid "Attribs"
+#: src/gtk/delete_dialog.c:69
+#, c-format
+msgid "Are you sure you want to delete these %ld directories"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:810
-msgid "Progress"
+#: src/gtk/delete_dialog.c:74
+msgid "Delete Files/Directories"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:920 src/gtk/misc-gtk.c:905 src/gtk/misc-gtk.c:976
+#: src/gtk/delete_dialog.c:90
+msgid "Delete"
+msgstr "Dealaigh"
+
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:942
-msgid "Error: You must type in a host to connect to\n"
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
+#, c-format
+msgid "Received URL %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1170
-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";
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1172 src/text/gftp-text.c:147
+#: src/gtk/gftp-gtk.c:142
+msgid "Exit"
+msgstr "Ealu"
+
+#: src/gtk/gftp-gtk.c:142
 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"
+"There are file transfers in progress.\n"
+"Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/menu-items.c:59 src/gtk/menu-items.c:89
-msgid "OpenURL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+msgid "Open Location"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
 msgstr ""
 
-#: src/gtk/menu-items.c:119
-msgid "Connect via URL"
-msgstr ""
+#: src/gtk/gftp-gtk.c:263
+msgid "/_FTP"
+msgstr "/F_TP"
 
-#: src/gtk/menu-items.c:119
-msgid "Enter ftp url to connect to"
+#: src/gtk/gftp-gtk.c:264
+msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/menu-items.c:152
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gftp-gtk.c:265
+msgid "/FTP/Window _1"
 msgstr ""
 
-#: src/gtk/menu-items.c:189 src/gtk/menu-items.c:192
-msgid "Change Filespec"
+#: src/gtk/gftp-gtk.c:267
+msgid "/FTP/Window _2"
 msgstr ""
 
-#: src/gtk/menu-items.c:192
-msgid "Enter the new file specification"
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
+msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/menu-items.c:220 src/gtk/menu-items.c:600 src/gtk/menu-items.c:658
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
 msgstr ""
 
-#: src/gtk/menu-items.c:249
-msgid "Save Directory Listing"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/menu-items.c:366
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: src/gtk/gftp-gtk.c:275
+msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: src/gtk/menu-items.c:385 src/gtk/menu-items.c:388
-msgid "Site"
+#: src/gtk/gftp-gtk.c:278
+msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/menu-items.c:388
-msgid "Enter site-specific command"
-msgstr ""
+#: src/gtk/gftp-gtk.c:279
+msgid "/_Local"
+msgstr "/_Áitiúl"
 
-#: src/gtk/menu-items.c:492 src/gtk/menu-items.c:526
-msgid "Chdir"
+#: src/gtk/gftp-gtk.c:280
+msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/menu-items.c:624 src/gtk/menu-items.c:682
-#, c-format
-msgid "Error: Error writing to %s: %s\n"
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/menu-items.c:693
-#, c-format
-msgid "Successfully wrote the log file to %s\n"
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
 msgstr ""
 
-#: src/gtk/menu-items.c:705
-msgid "Save Log"
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
+msgid "/Local/sep"
 msgstr ""
 
-#: src/gtk/menu-items.c:741
-#, c-format
-msgid ""
-"Cannot find the license agreement file COPYING. Please make sure it is in "
-"either %s or in %s"
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/menu-items.c:745 src/gtk/menu-items.c:750
-msgid "About gFTP"
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
 msgstr ""
 
-#: src/gtk/menu-items.c:781
-#, c-format
-msgid ""
-"%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
-"Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
+#: src/gtk/gftp-gtk.c:288
+msgid "/Local/Select _All"
 msgstr ""
 
-#: src/gtk/menu-items.c:782 src/text/gftp-text.c:387
-msgid "Translated by"
+#: src/gtk/gftp-gtk.c:289
+msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:793
-msgid "About"
+#: src/gtk/gftp-gtk.c:290
+msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/menu-items.c:842
-msgid "License Agreement"
+#: src/gtk/gftp-gtk.c:292
+msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/menu-items.c:848 src/gtk/view_dialog.c:378
-msgid "  Close  "
+#: src/gtk/gftp-gtk.c:293
+msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/menu-items.c:930
-msgid "Compare Windows"
+#: src/gtk/gftp-gtk.c:294
+msgid "/Local/_Change Directory"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:211
-msgid "Refresh"
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:304
-msgid "All Files"
-msgstr ""
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "Fillteán Nua"
 
-#: src/gtk/misc-gtk.c:311
-msgid "] (Cached) ["
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:336
-msgid "Not connected"
+#: src/gtk/gftp-gtk.c:300
+msgid "/Local/_Delete..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:422
-#, c-format
-msgid "Error opening file %s: %s\n"
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:511
-#, c-format
-msgid "%s: Not connected to a remote site\n"
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:518
-#, c-format
-msgid "%s: This feature is not available using this protocol\n"
+#: src/gtk/gftp-gtk.c:304
+msgid "/Local/_Refresh"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:526
-#, c-format
-msgid "%s: You must only have one item selected\n"
+#: src/gtk/gftp-gtk.c:306
+msgid "/_Remote"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:533
-#, c-format
-msgid "%s: You must have at least one item selected\n"
+#: src/gtk/gftp-gtk.c:307
+msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:902 src/gtk/misc-gtk.c:973
-msgid "Change"
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:908 src/gtk/misc-gtk.c:979 src/gtk/rename_dialog.c:102
-#: src/gtk/rename_dialog.c:114
-msgid "Rename"
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:970 src/gtk/options_dialog.c:1179
-msgid "Add"
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
+msgid "/Remote/sep"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:996
-msgid "Cancel"
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1066
-msgid "  Yes  "
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1076
-msgid "  No  "
+#: src/gtk/gftp-gtk.c:316
+msgid "/Remote/Select _All"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1135
-msgid "Getting directory listings"
+#: src/gtk/gftp-gtk.c:317
+msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1155
-msgid "  Stop  "
+#: src/gtk/gftp-gtk.c:318
+msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1165
-#, c-format
-msgid ""
-"Received %ld directories\n"
-"and %ld files"
+#: src/gtk/gftp-gtk.c:320
+msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1285
-#, c-format
-msgid "gFTP Error: Cannot find file %s in %s or %s\n"
+#: src/gtk/gftp-gtk.c:321
+msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:79
-msgid "Mkdir: Operation canceled...you must enter a string\n"
+#: src/gtk/gftp-gtk.c:322
+msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:101
-msgid "Mkdir"
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:105
-msgid "Make Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "Fillteán Nua"
 
-#: src/gtk/mkdir_dialog.c:105
-msgid "Enter name of directory to create"
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: src/gtk/options_dialog.c:919
-msgid "Edit Host"
+#: src/gtk/gftp-gtk.c:328
+msgid "/Remote/_Delete..."
 msgstr ""
 
-#: src/gtk/options_dialog.c:919
-msgid "Add Host"
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/options_dialog.c:951 src/gtk/options_dialog.c:1042
-msgid "Domain"
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
 msgstr ""
 
-#: src/gtk/options_dialog.c:971
-msgid "Network Address"
+#: src/gtk/gftp-gtk.c:331
+msgid "/Remote/_Refresh"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1004 src/gtk/options_dialog.c:1144
-msgid "Netmask"
+#: src/gtk/gftp-gtk.c:333
+msgid "/_Bookmarks"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1150
-msgid "Local Hosts"
+#: src/gtk/gftp-gtk.c:334
+msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1186 src/gtk/view_dialog.c:91
-msgid "Edit"
+#: src/gtk/gftp-gtk.c:335
+msgid "/Bookmarks/Add _Bookmark"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1248 src/gtk/options_dialog.c:1253
-msgid "Options"
+#: src/gtk/gftp-gtk.c:337
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr ""
 
-#: src/gtk/rename_dialog.c:80
-msgid "Rename: Operation canceled...you must enter a string\n"
+#: src/gtk/gftp-gtk.c:338
+msgid "/Bookmarks/sep"
 msgstr ""
 
-#: src/gtk/rename_dialog.c:112
-#, c-format
-msgid "What would you like to rename %s to?"
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
 msgstr ""
 
-#: src/gtk/transfer.c:173
-msgid "Receiving file names..."
+#: src/gtk/gftp-gtk.c:340
+msgid "/Transfer/tearoff"
 msgstr ""
 
-#: src/gtk/transfer.c:290
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
 msgstr ""
 
-#: src/gtk/transfer.c:317 src/gtk/transfer.c:1317
-msgid "Connecting..."
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
 msgstr ""
 
-#: src/gtk/transfer.c:327 src/gtk/transfer.c:1198 src/gtk/transfer.c:1209
-msgid "Enter Password"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
 msgstr ""
 
-#: src/gtk/transfer.c:328 src/gtk/transfer.c:1199 src/gtk/transfer.c:1210
-msgid "Please enter your password for this site"
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: src/gtk/transfer.c:418 src/gtk/transfer.c:1936 src/gtk/transfer.c:1945
-msgid "Transfer Files"
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: src/gtk/transfer.c:426
-msgid "Retrieve Files: Not connected to a remote site\n"
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: src/gtk/transfer.c:665
-msgid "Error: Remote site disconnected after trying to transfer file\n"
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: src/gtk/transfer.c:714
-#, c-format
-msgid "Could not download %s from %s\n"
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: src/gtk/transfer.c:737
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: src/gtk/transfer.c:847 src/gtk/transfer.c:1090 src/gtk/transfer.c:1176
-#: src/gtk/transfer.c:1640
-msgid "Skipped"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/transfer.c:851 src/gtk/transfer.c:1152 src/gtk/transfer.c:1180
-msgid "Waiting..."
+#: src/gtk/gftp-gtk.c:356
+msgid "/Log/tearoff"
 msgstr ""
 
-#: src/gtk/transfer.c:1002
-#, c-format
-msgid "Error: Child %d returned %d\n"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/transfer.c:1005
-#, c-format
-msgid "Child %d returned successfully\n"
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
 msgstr ""
 
-#: src/gtk/transfer.c:1012
-#, c-format
-msgid "Error: Cannot get information about file %s: %s\n"
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
 msgstr ""
 
-#: src/gtk/transfer.c:1017
-#, c-format
-msgid "File %s was not changed\n"
-msgstr ""
+#: src/gtk/gftp-gtk.c:360
+msgid "/Tool_s"
+msgstr "/Uirli_sí"
 
-#: src/gtk/transfer.c:1025
-#, c-format
-msgid ""
-"File %s has changed.\n"
-"Would you like to upload it?"
+#: src/gtk/gftp-gtk.c:361
+msgid "/Tools/tearoff"
 msgstr ""
 
-#: src/gtk/transfer.c:1028
-msgid "Edit File"
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: src/gtk/transfer.c:1093
-msgid "Finished"
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: src/gtk/transfer.c:1133
-#, c-format
-msgid "Stopping the transfer of %s\n"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
+msgstr "/C_uidiú"
+
+#: src/gtk/gftp-gtk.c:365
+msgid "/Help/tearoff"
 msgstr ""
 
-#: src/gtk/transfer.c:1361
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+#: src/gtk/gftp-gtk.c:366
+msgid "/Help/_About"
 msgstr ""
 
-#: src/gtk/transfer.c:1391
-#, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
+msgstr "Óstainm:"
+
+#: src/gtk/gftp-gtk.c:508
+msgid "Port: "
 msgstr ""
 
-#: src/gtk/transfer.c:1400
-#, c-format
-msgid "Recv %s of %s, transfer stalled, unknown time remaining"
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
+msgstr "Úsáideoir:"
+
+#: src/gtk/gftp-gtk.c:550
+msgid "Pass: "
 msgstr ""
 
-#: src/gtk/transfer.c:1434
-#, c-format
-msgid "Retrieving file names...%s bytes"
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
 msgstr ""
 
-#: src/gtk/transfer.c:1512 src/gtk/transfer.c:1534 src/gtk/transfer.c:1568
-#: src/gtk/transfer.c:1608 src/gtk/transfer.c:1661 src/gtk/transfer.c:1720
-msgid "There are no file transfers selected\n"
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
+msgid "Filename"
 msgstr ""
 
-#: src/gtk/transfer.c:1552
-#, c-format
-msgid "Stopping the transfer on host %s\n"
+#: src/gtk/gftp-gtk.c:770
+msgid "Size"
 msgstr ""
 
-#: src/gtk/transfer.c:1593 src/gtk/transfer.c:1646
-#, c-format
-msgid "Skipping file %s on host %s\n"
+#: src/gtk/gftp-gtk.c:773
+msgid "Date"
 msgstr ""
 
-#: src/gtk/transfer.c:1807 src/gtk/transfer.c:2012 src/gtk/transfer.c:2022
-#: src/gtk/transfer.c:2045
-msgid "Overwrite"
+#: src/gtk/gftp-gtk.c:774
+msgid "Attribs"
 msgstr ""
 
-#: src/gtk/transfer.c:1829 src/gtk/transfer.c:2027 src/gtk/transfer.c:2051
-msgid "Resume"
+#: src/gtk/gftp-gtk.c:969
+msgid "Progress"
 msgstr ""
 
-#: src/gtk/transfer.c:1851 src/gtk/transfer.c:2017
-msgid "Skip"
+#: src/gtk/gftp-gtk.c:1086
+msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1931
-msgid "Action"
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
 msgstr ""
 
-#: src/gtk/transfer.c:1957
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "Úsáideoir:"
+
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
 msgstr ""
 
-#: src/gtk/transfer.c:2057
-msgid "Skip File"
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
 msgstr ""
 
-#: src/gtk/transfer.c:2067
-msgid "Select All"
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/transfer.c:2073
-msgid "Deselect All"
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/view_dialog.c:35
-msgid "View"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/view_dialog.c:47
-#, c-format
-msgid "View: %s is a directory. Cannot view it.\n"
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
 msgstr ""
 
-#: src/gtk/view_dialog.c:113
+#: src/gtk/gtkui.c:368
 #, c-format
-msgid "Edit: %s is a directory. Cannot edit it.\n"
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
-#, c-format
-msgid "View: Cannot fork another process: %s\n"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
-#, c-format
-msgid "Running program: %s %s\n"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/view_dialog.c:245
-#, c-format
-msgid "Opening %s with %s\n"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/view_dialog.c:280
-#, c-format
-msgid "Viewing file %s\n"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/view_dialog.c:287
-#, c-format
-msgid "View: Cannot open file %s: %s\n"
+#: 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/text/gftp-text.c:29
-msgid "about"
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
 msgstr ""
 
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
 msgstr ""
 
-#: src/text/gftp-text.c:31
-msgid "ascii"
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
 msgstr ""
 
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
 msgstr ""
 
-#: src/text/gftp-text.c:33
-msgid "binary"
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
 msgstr ""
 
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/text/gftp-text.c:35
-msgid "cd"
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
 
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
 msgstr ""
 
-#: src/text/gftp-text.c:37
-msgid "chdir"
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
 msgstr ""
 
-#: src/text/gftp-text.c:39
-msgid "chmod"
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
 msgstr ""
 
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
 msgstr ""
 
-#: src/text/gftp-text.c:41
-msgid "clear"
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
 msgstr ""
 
-#: src/text/gftp-text.c:43
-msgid "close"
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
 msgstr ""
 
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:45
-msgid "delete"
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
 msgstr ""
 
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
+#, c-format
+msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:47
-msgid "get"
+#: src/gtk/menu-items.c:382
+#, c-format
+msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
+#: src/gtk/menu-items.c:394
+msgid "Save Log"
 msgstr ""
 
-#: src/text/gftp-text.c:49
-msgid "help"
+#: src/gtk/menu-items.c:428
+#, c-format
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
 msgstr ""
 
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
+#: src/gtk/menu-items.c:430
+msgid "About gFTP"
 msgstr ""
 
-#: src/text/gftp-text.c:51
-msgid "lcd"
+#: src/gtk/menu-items.c:460
+#, c-format
+msgid ""
+"%s\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
+"Official Homepage: http://www.gftp.org/\n";
 msgstr ""
 
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
+#: src/gtk/menu-items.c:473
+msgid "About"
 msgstr ""
 
-#: src/text/gftp-text.c:53
-msgid "lchdir"
+#: src/gtk/menu-items.c:506
+msgid "License Agreement"
 msgstr ""
 
-#: src/text/gftp-text.c:55
-msgid "lchmod"
+#: src/gtk/menu-items.c:613
+msgid "Compare Windows"
 msgstr ""
 
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
 msgstr ""
 
-#: src/text/gftp-text.c:57
-msgid "ldelete"
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
+#: src/gtk/misc-gtk.c:260
+msgid "All Files"
 msgstr ""
 
-#: src/text/gftp-text.c:59
-msgid "lls"
+#: src/gtk/misc-gtk.c:270
+msgid "] (Cached) ["
 msgstr ""
 
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
+#: src/gtk/misc-gtk.c:281
+msgid "Not connected"
 msgstr ""
 
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
+#: src/gtk/misc-gtk.c:383
+#, c-format
+msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
+#: src/gtk/misc-gtk.c:468
+#, c-format
+msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/text/gftp-text.c:63
-msgid "lpwd"
+#: src/gtk/misc-gtk.c:475
+#, c-format
+msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
+#: src/gtk/misc-gtk.c:483
+#, c-format
+msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/text/gftp-text.c:65
-msgid "lrename"
+#: src/gtk/misc-gtk.c:490
+#, c-format
+msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
+#: src/gtk/misc-gtk.c:814
+msgid "Change"
 msgstr ""
 
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
+#: src/gtk/misc-gtk.c:973
+msgid "Getting directory listings"
 msgstr ""
 
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
+#: src/gtk/misc-gtk.c:993
+msgid "  Stop  "
 msgstr ""
 
-#: src/text/gftp-text.c:69
-msgid "ls"
+#: src/gtk/misc-gtk.c:1003
+#, c-format
+msgid ""
+"Received %ld directories\n"
+"and %ld files"
 msgstr ""
 
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
+#: src/gtk/misc-gtk.c:1079
+#, c-format
+msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:71
-msgid "mget"
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
 msgstr ""
 
-#: src/text/gftp-text.c:73
-msgid "mkdir"
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
 msgstr ""
 
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
 msgstr ""
 
-#: src/text/gftp-text.c:75
-msgid "mput"
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
 msgstr ""
 
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
+#: src/gtk/options_dialog.c:978
+msgid "_Network address:"
 msgstr ""
 
-#: src/text/gftp-text.c:77
-msgid "open"
+#: src/gtk/options_dialog.c:1013
+msgid "N_etmask:"
 msgstr ""
 
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
+#: src/gtk/options_dialog.c:1056
+msgid "_Domain:"
 msgstr ""
 
-#: src/text/gftp-text.c:79
-msgid "put"
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
 msgstr ""
 
-#: src/text/gftp-text.c:81
-msgid "pwd"
+#: src/gtk/options_dialog.c:1139
+msgid "Local Hosts"
 msgstr ""
 
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
+#: src/gtk/options_dialog.c:1240
+msgid "Options"
 msgstr ""
 
-#: src/text/gftp-text.c:83
-msgid "quit"
+#: src/gtk/transfer.c:30
+msgid "Receiving file names..."
 msgstr ""
 
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
+msgid "Connecting..."
 msgstr ""
 
-#: src/text/gftp-text.c:85
-msgid "rename"
+#: src/gtk/transfer.c:99
+msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
+#: src/gtk/transfer.c:336
+#, c-format
+msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/text/gftp-text.c:87
-msgid "rmdir"
+#: src/gtk/transfer.c:345
+#, c-format
+msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
+#: src/gtk/transfer.c:352
+#, c-format
+msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: src/text/gftp-text.c:89
-msgid "set"
+#: src/gtk/transfer.c:368
+#, c-format
+msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
+#: src/gtk/transfer.c:374
+#, c-format
+msgid "File %s was not changed\n"
 msgstr ""
 
-#: src/text/gftp-text.c:145
+#: src/gtk/transfer.c:382
+#, c-format
 msgid ""
-">.\n"
-"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";
+"File %s has changed.\n"
+"Would you like to upload it?"
 msgstr ""
 
-#: src/text/gftp-text.c:228
-msgid "Error: Command not recognized\n"
+#: src/gtk/transfer.c:385
+msgid "Edit File"
 msgstr ""
 
-#: src/text/gftp-text.c:335
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
+#: src/gtk/transfer.c:476
+msgid "Finished"
 msgstr ""
 
-#: src/text/gftp-text.c:411 src/text/gftp-text.c:427 src/text/gftp-text.c:470
-#: src/text/gftp-text.c:493 src/text/gftp-text.c:516 src/text/gftp-text.c:542
-#: src/text/gftp-text.c:570 src/text/gftp-text.c:604 src/text/gftp-text.c:697
-#: src/text/gftp-text.c:715 src/text/gftp-text.c:736 src/text/gftp-text.c:809
-msgid "Error: Not connected to a remote site\n"
+#: src/gtk/transfer.c:734
+#, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/text/gftp-text.c:433 src/text/gftp-text.c:450
-msgid "usage: chdir <directory>\n"
+#: src/gtk/transfer.c:739
+#, c-format
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/text/gftp-text.c:477
-msgid "usage: mkdir <new directory>\n"
+#: src/gtk/transfer.c:750
+#, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/text/gftp-text.c:500
-msgid "usage: rmdir <directory>\n"
+#: src/gtk/transfer.c:756
+#, c-format
+msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/text/gftp-text.c:523
-msgid "usage: delete <file>\n"
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/text/gftp-text.c:552
-msgid "usage: rename <old name> <new name>\n"
+#: src/gtk/transfer.c:804
+#, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/text/gftp-text.c:580
-msgid "usage: chmod <mode> <file>\n"
+#: src/gtk/transfer.c:842
+#, c-format
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/text/gftp-text.c:743
-msgid "usage: mget <filespec>\n"
+#: 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 ""
 
-#: src/text/gftp-text.c:816
-msgid "usage: mput <filespec>\n"
+#: src/gtk/view_dialog.c:34
+msgid "View"
 msgstr ""
 
-#: src/text/gftp-text.c:954
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr ""
+
+#: src/gtk/view_dialog.c:49
 #, c-format
-msgid "Could not download %s\n"
+msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/text/gftp-text.c:961
+#: src/gtk/view_dialog.c:52
 #, c-format
-msgid "Successfully transferred %s\n"
+msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1028
-msgid ""
-"Supported commands:\n"
-"\n"
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1084
-msgid "usage: set [variable = value]\n"
+#: src/gtk/view_dialog.c:177
+#, c-format
+msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1098
+#: src/gtk/view_dialog.c:180
 #, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1105
+#: src/gtk/view_dialog.c:238
 #, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgid "Opening %s with %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1133
-msgid "Invalid argument\n"
+#: src/gtk/view_dialog.c:280
+#, c-format
+msgid "Viewing file %s\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:287
+#, c-format
+msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1158
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1236
-msgid "Clear the directory cache\n"
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "Úsáideoir:"
+
+#: src/text/textui.c:158
+#, c-format
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
+
+#~ msgid "WARNING"
+#~ msgstr "RABHADH"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cealaigh "
diff --git a/po/gl.po b/po/gl.po
index fc61f11..870bbd0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,51 +9,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-master-po-gl-11744\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 20:17+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-05-25 14:43+0200\n"
 "Last-Translator: Antón Méixome <meixome mancomun org>\n"
 "Language-Team: Galician <gnome mancomun org>\n"
+"Language: gl\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"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s incorrecta\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Erro: Liña non válida %s no ficheiro índice do caché\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Erro: Non se puido crear o directorio %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Erro: Non se puido crear o ficheiro temporal: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Erro pechando descritor do ficheiro: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Erro: Non se puido buscar no ficheiro %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -61,49 +61,49 @@ msgstr ""
 "Erro ao convertir a cadea '%s' desde o conxunto de caracteres %s ao conxunto "
 "de caracteres %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Erro: Non se puido abrir o ficheiro local %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Erro: Non se pode escribir no socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Erro: Non se pode ler desde socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Erro de gFTP: Nome incorrecto para o ficheiro de marcadores %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Advertencia: Non se puido atopar o ficheiro maestro de marcadores %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Erro de gFTP: Non se puido abrir o ficheiro de marcadores %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 "Advertencia de gFTP: Omitindo a liña %d no ficheiro de marcadores: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Advertencia de gFTP: A liña %d non ten suficientes argumentos\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -113,7 +113,7 @@ msgstr ""
 "local e non é necesario acceder a eles a través do proxy (se o hai). "
 "Sintaxe: dont_use_proxy=.dominio ou dont_use_proxy=número_rede/máscara"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -122,56 +122,56 @@ msgstr ""
 "visualización. Nota: Tódolos argumentos excepto a extensión do ficheiro son "
 "opcionais"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Erro de gFTP: Nome do ficheiro de configuración %s incorrecto\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Erro de gFTP: Non se pode crear o directorio %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Erro de gFTP: Non se puido atopar o ficheiro de configuración maestro %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Fixo un make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Erro de gFTP: Non se puido abrir o ficheiro de configuración %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Terminando debido a erros de análisis na liña %d no ficheiro de "
 "configuración\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 "Advertencia de gFTP: Omitindo a liña %d no ficheiro de configuración: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Erro de gFTP: Nome do ficheiro %s de rexistro incorrecto\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Advertencia de gFTP: Non se puido abrir %s para escritura: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -180,7 +180,7 @@ msgstr ""
 "<masneyb gftp org>. Advertencia: Calquera comentario que vostede engada a "
 "este ficheiro será sobreescrito"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -192,7 +192,7 @@ msgstr ""
 "recordada por alguén que o mire por riba mentras edita este ficheiro. Antes "
 "tódolos contrasinais gardábanse en texto chan."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -203,96 +203,95 @@ msgstr ""
 "este ficheiro será sobreescrito. Se unha entrada ten un (*) no seu "
 "comentario, non poderá cambialo desde dentro de gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<descoñecido>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "Erro fatal de gFTP: A opción de configuración '%s' non se encontrou na tabla "
 "global hash\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Erro: Non se pode subir o ficheiro %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Erro: Non se pode escribir no ficheiro %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Erro: Erro pechando o ficheiro: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Listado de ficheiros corrompido desde o servidor FSP %s\n"
 
-#: ../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
+#: 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 "descoñecido"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Non se puido obter o listado do directorio FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Cambiouse ao directorio %s correctamente\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Non se puido cambiar o directorio a %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Eliminado %s correctamente\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Erro: Non se puido eliminar o directorio %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Erro : Non se puido eliminar o ficheiro %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Directorio %s creado correctamente\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Renomeado %s a %s correctamente\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Erro: Non se puido renomear %s a %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -300,7 +299,7 @@ msgstr ""
 "O soporte FTPS non está dispoñible debido a que o soporte SSL non se "
 "compilou. Abortando conexión.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -308,107 +307,105 @@ msgstr ""
 "O soporte HTTPS non está dispoñible debido a que o soporte SSL non se "
 "compilou. Abortando conexión.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Non se puido obter o directorio actual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Cambiouse ao directorio local %s correctamente\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Non se puido cambiar ao directorio local %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Erro: Non se puido truncar o ficheiro local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Non se puido obter o listado do directorio local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Modo de %s cambiados a %o correctamente\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Erro: Non se puido cambiar o modo de %s a %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Cambiouse a marca de tempo de %s correctamente\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Erro: Non se puido cambiar a marca de tempo de %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema de ficheiros local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uso: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ningún"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ficheiro"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "tamaño"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "usuario"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "horadata"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributos"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendente"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendente"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Xeral"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Ver programa:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -416,27 +413,27 @@ msgstr ""
 "O programa predeterminado para ver os ficheiros. Se o deixa en branco, "
 "utilizarase o visor interno"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Editar programa:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Programa predeterminado para editar os ficheiros."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Tamaño máximo da xanela de rexistro:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "O tamaño máximo da xanela de rexistro en bytes para o portado a GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conxuntos de caracteres remotos:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -444,11 +441,11 @@ msgstr ""
 "Esta é unha lista separada por caracteres para intentar converter os "
 "mensaxes remotos á localización actual"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remoto:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -456,195 +453,199 @@ msgstr ""
 "Este é o valor de LC_TIME para o sitio remoto. Isto é para que as datas "
 "poidan indicarse apropiadamente nos listados do directorio."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Caché TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Número de segundos que conservarán as entradas da caché antes de que expiren."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Engadir transferencias de ficheiros"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Engadir novas transferencias sobre as existentes"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Realizar unha transferencia á vez"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Realizar só unha transferencia á vez?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sobreescribir por defecto"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Sobreescribir por defecto os ficheiros o continuar a transferencia dos "
 "ficheiros"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Preservar os permisos do ficheiro"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Preservar os permisos dos ficheiros transferidos"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Preservar a data do ficheiro"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Preservar a data dos ficheiros transferidos"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Actualizar despois de cada ficheiro transferido"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Actualizar as xanelas despois de cada transferencia de ficheiro"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordear cos directorios ao principio"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Mostra tódolos directorios e despois os ficheiros"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostra os ficheiros agochados"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostra os ficheiros agochados nas xanelas"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostra o estado da transferencia no título"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostra o estado da transferencia na barra de título"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Comezar transferencias"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Comezar automaticamente as transeferencias dos ficheiros cando se introducen "
 "na cola"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permitir ordes manuais no GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permite introducir ordes manuais na GUI (funcións como o porto do texto)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Lembrar o último directorio"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Garda o último directorio local e remoto cando se cerra o aplicativo"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Conecta ao servidor remoto no inicio"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Conecta automaticamente ao servidor remoto cando se inicia o aplicativo."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rede"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Tempo de espera de rede:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "O tempo de espera para entrada/saída de rede. Isto NON é un tempo de espera "
 "de conexión inactiva."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Reintentos de conexión:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Número de intentos de conexión. Póñao a 0 para reintentar indefinidamente"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Espera entre reintentos:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Número de segundos de espera entre reintentos"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KB/S máximos:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Velocidad máxima en KB/s que se permitirá a unha transferencia de ficheiro. "
 "(Póngalo a 0 para desactivalo)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Tamaño do bloque de transferencia:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "O tamaño de bloque que se usa ao transferir ficheiros. Isto debería ser un "
 "múltiplo de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocolo predeterminado:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Isto especifica o protocolo predeterminado a usar"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activar soporte IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -652,27 +653,27 @@ msgstr ""
 "Isto define qué ocorrerá ao facer unha dobre pulsación sobre un ficheiro nas "
 "xanelas. 0=Ver o ficheiro 1=Editar o ficheiro 2=Transferir o ficheiro"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Ancho predeterminado para a xanela de ficheiros locais"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Ancho predeterminado para a xanela de ficheiros remotos"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Altura predeterminada para a xanela de ficheiros locais/remotos"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Altura predeterminada para a xanela transferencias"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Altura predeterminada para a xanela de rexistro"
 
-#: ../lib/options.h:177
+#: 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."
@@ -680,15 +681,15 @@ msgstr ""
 "O largo da columna do nome do ficheiro na xanela de transferencia. Póñase en "
 "0 para que redimensione a columna automaticamente."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "A columna predeterminada para ordear "
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordear ascendentemente ou descendentemente"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -697,7 +698,7 @@ msgstr ""
 "para que redimensione a columna automaticamente. Póñase en -1 para "
 "desactivar esta columna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -706,7 +707,7 @@ msgstr ""
 "redimensione a columna automaticamente. Póngalo en -1 para desactivar esta "
 "columna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -715,7 +716,7 @@ msgstr ""
 "redimensione esta columna automaticamente. Póngalo en -1 para desactivar "
 "esta columna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -724,7 +725,7 @@ msgstr ""
 "redimensione a columna automaticamente. Póngalo en -1 para desactivar esta "
 "columna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -733,7 +734,7 @@ msgstr ""
 "redimensionar a columna automaticamente. Póngalo en -1 para desactivar esta "
 "columna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -742,75 +743,75 @@ msgstr ""
 "redimensionar a columna automaticamente. Póngalo en -1 para desactivar esta "
 "columna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "A cor das ordes que lle son enviadas ao servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "A cor das ordes que son recibidas do servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "A cor das mensaxes de erro"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "A cor do resto das mensaxes do rexistro"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "A transferencia de ficheiros limitarase a %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Erro ao establecer LC_TIME a '%s'. Usarase '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Cargando listado de directorios %s desde caché (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Cargando listado de directorios %s desde o servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -819,112 +820,112 @@ msgstr ""
 "Advertencia: Recortando ruta dun ficheiro '%s'. A ruta recortada (%s) non "
 "coincide co directorio actual (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Erro: Non se puido escribir na caché: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Erro: Non se encontrou o marcador %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Erro nos marcadores: A entrada %s non ten un nome no servidor\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "O protocolo '%s' non está actualmente soportado.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Atopouse unha ligazón recursiva simbólica %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Erro: O servidor remoto %s está desconectado. Alcanzouse o máximo número de "
 "reintentos... abortando\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Erro: O servidor remoto %s está desconectado. Intentarase volver a conectar "
 "en %d segundos\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Erro: Non se puido establecer o peche na marca de execución: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Non se puido abrir pty maestro %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Non se puido crear un par de socket: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Erro: Non se puido executar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Non se puido bifurcar outro proceso: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nome do servidor proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nome do cortalumes"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Porto do proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Porto polo que conectar coa devasa"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nome de usuario no proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Usuario no cortalumes"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Contrasinal no proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Contrasinal no cortalumes"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Usar HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Quere usar HTTP/1.1 ou HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -933,65 +934,65 @@ msgstr ""
 "Recibiuse unha resposta incorrecta do servidor, desconexión\n"
 "O servidor remoto devolveu un tamaño '%s' de fragmento incorrecto\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Desconectando do sitio %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Comezando a transferencia de ficheiros desde a posición"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Non se puido recibir o ficheiro %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Recibindo a lista do cartafol...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Recibiuse unha resposta incorrecta do servidor, desconexión\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Orde SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "usuario servidor"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "usuario servidor:porto"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICACIÓN"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "usuario servidor porto"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "usuario servidor NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Correo electrónico:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -999,19 +1000,19 @@ msgstr ""
 "Este é o contrasinal que se usará cando inicie sesión a un servidor FTP "
 "remoto como usuario anónimo"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Conta no proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Conta no cortalumes (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo de servidor proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1028,11 +1029,11 @@ msgstr ""
 "(usuario), p (contrasinal), h (host), o (porto) ou a (conta). Por exemplo, "
 "para especificar o usuario proxy, pode poñer %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorar enderezo PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1044,11 +1045,11 @@ msgstr ""
 "necesitarse para os encamiñadores que dan súa IP interna en vez do seu "
 "enderezo IP externo na súa resposta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferencias pasivas"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1063,11 +1064,11 @@ msgstr ""
 "permita isto. Se isto está desactivado, gFTP abrirá un porto no lado do "
 "cliente e o servidor remoto intenterá conectarse a el."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolver as ligazóns simbólicas remotas (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1079,15 +1080,16 @@ msgstr ""
 "queira desactivar isto é cando o servidor FTP remoto non soporte a opción -L "
 "en LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferir ficheiros en modo ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1097,333 +1099,324 @@ msgstr ""
 "UNIX para UNIX, entón é seguro deixar isto desactivado. Se estás descargando "
 "datos binarios, deberá desactivar isto."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Recibiuse unha resposta incorrecta '%c' do servidor.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Non se pode crear un socket IPv4: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Non se puido atopar un enderezo IP na resposta PASV '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Ignorar o enderezo IP na resposta PASV, conectando a %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Non se puido crear unha conexión de datos: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Non se puido obter o nome do socket: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Non se pode vincular un porto: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Non se puido escoitar un porto %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Non se puido crear un socket IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Erro: Non parece que esté conectado por IPv6. Abortando conexión.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Resposta a EPSV inválida '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Non se puido obter o enderezo do socket local: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Non se puido aceptar a conexión desde o servidor: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Advertencia: Non se puido interpretar o listado %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Buscando %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Non se puido atopar o servidor %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Non se puido crear un socket: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Intentando %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Non se puido conectar a %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Conectado a %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Non se puido atopar o nome do servizo %s/tcp. Comprobe seu ficheiro de "
 "servizos\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Excedeuse o tempo máximo para a conexión a %s\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Non se puido obter os flags do socket: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Non se puido poñer o socket en estado non bloqueante: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nome do programa SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "A ruta ao executable SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parámetros adicionais para SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parámetros adicionais para o programa SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH necesita usuario/contrasinal"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Para conexións SSH requírese un usuario/contrasinal"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Executando programa %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Introduza a frase de paso para a clave RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Introduza a frase de paso para a clave"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "contrasinal"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(si/non)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Introduza o CONTRASINAL:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduce o contrasinal"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduza o contrasinal SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Erro: Introduciuse un contrasinal incorrecto\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialización do protocolo\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versión do protocolo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Abrir %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Pechar\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Abrir directorio %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Ler directorio\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Eliminar ficheiro %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Crear directorio %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Eliminar directorio %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Ruta verdadeira %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributos do ficheiro\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Estatísticas %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Non existe o ficheiro ou directorio"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Erro"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mensaxe erróneo"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Sen conexión"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Conexión perdida"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operación non soportada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "O servidor devolveu unha mensaxe descoñecida"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Erro: Tamaño da mensaxe %d moi grande\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Erro: Tamaño da mensaxe %d moi grande desde o servidor\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1431,41 +1424,41 @@ msgstr ""
 "Houbo un erro iniciando a conexión SSH co servidor remoto. A mensaxe de erro "
 "desde o servidor remoto segue a continuación:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Abrindo unha conexión SSH a %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Inicio de sesión correcto no servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Ficheiro de entropía SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Ficheiro de entropía SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Lonxitude da semente de entropía:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "O número máximo de bytes da semente para o motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificar SSL do compañeiro"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1478,11 +1471,11 @@ msgstr ""
 "Asunto = %s\n"
 "Erro %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Non se puido obter o certificado do compañeiro\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1491,45 +1484,45 @@ msgstr ""
 "ERRO: O host no certificado SSL (%s) non coincide co host co que se conectou "
 "(%s). Abortando conexión.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Non se puido iniciar a biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Erro cargando os certificados SSL predeterminados\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Erro o establecer a lista de cifrados (non hai cifrados válidos)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Erro: O motor SSL non foi iniciado\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Erro establecendo a conexión SSL (Obxeto BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Erro establecendo a conexión SSL (Obxeto SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Erro co certificado do compañeiro: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operación anulada\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Esperando %d segundos para volver a intentar a conexión\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1539,75 +1532,75 @@ msgstr ""
 "ficheiro COPYING. Isto é software libre, e pode redistribuílo baixo certas "
 "condicións, para máis detalles, lea o ficheiro COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Traducido ao galego por: Ignacio Casal Quinteiro <adorador_del_heavy hotmail "
 "com> Proxecto trasno: <www.trasno.net>; Mancomún <g11n mancomun org>"
 
-#: ../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
+#: 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 "Erro: Non está conectado a un servidor remoto\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "uso: chmod <modo> <ficheiro>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "uso: renomear <nome antigo> <nome novo>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "uso: eliminar <ficheiro>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "uso: rmdir <directorio>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uso: sitio <orde do sitio>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "uso: mkdir <directorio novo>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "uso: chdir <directorio>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argumento inválido\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Limpando a caché do directorio\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uso: abrir"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "uso: set [variable = valor]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Erro: A variable %s non é unha variable de configuración válida.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Erro: A variable %s non está dispoñible na portación a texto de gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1615,289 +1608,289 @@ msgstr ""
 "Ordes compatíbeis:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uso: %s <filtro>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "acerca de"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Mostra información de gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "Establece o modo actual de transferencia de ficheiros a Ascii (só por FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binario"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Establece o modo actual de transferencia de ficheiros a Binario (só por FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Cambia o directorio de traballo remoto"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Cambia os permisos do ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "limpar"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opcións dispoñibles: caché"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "pechar"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desconecta dun sitio remoto"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "Eliminar"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Elimina o ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Mostra o listado de directorios do directorio remoto actual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Descarga o ficheiro(s) remoto"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "axuda"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Mostra esta axuda en pantalla"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Cambia o directorio local de traballo"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Cambia os permisos dun ficheiro local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Elimina o ficheiro local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Mostra o listado de directorios do directorio local actual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crear un directorio local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Mostrar o directorio local actual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renomear un ficheiro local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Eliminar un directorio local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crea un directorio remoto"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Envía ficheiro(s) local(s)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "abrir"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Abre unha conexión a un sitio remoto"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Mostra o directorio remoto actual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "saír"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Finalizar desde gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "renomear"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renomear o ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Renomea un cartafol remoto"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Mostra variables do ficheiro de configuración. Pode establecer variables "
 "facendo set var=valor"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "sitio"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Executo unha orde específica para o sitio"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Erro: Orde non recoñecida\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Transferencia %s correcta a %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Omitindo ficheiro %s no servidor %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Detendo a transferencia no servidor %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Non se pode descargar %s desde %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1907,39 +1900,38 @@ msgstr ""
 "Comprobe o rexistro buscando aqueles ítems que non fosen transferidos "
 "adecuadamente."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Por favor, prema o botón de detención antes de facer calquera outra "
 "cousa\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Executar marcador"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Engadir marcador: Ti debes introducir un nome para o marcador\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Engadir marcador: Non se puido engadir o marcador %s porque ese nome xa "
 "existe\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Engadir marcador"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Engadir marcador: Debes introducir un nome de servidor\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1949,31 +1941,31 @@ msgstr ""
 "Pode separar os elementos por unha barra / para incluílos nun submenú\n"
 "(ex: Sitios sobre Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Lembrar contrasinal"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Debe especificar un nome para o marcador."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Novo directorio"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduce o nome do novo directorio"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Novo elemento"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduce o nome do novo elemento a crear"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1982,106 +1974,99 @@ msgstr ""
 "Está seguro de que quere borrar o marcador\n"
 "%s e tódolos seus descendentes?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Eliminar marcador"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editar entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nome de servidor:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directorio remoto:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directorio local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Iniciando sesión como ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Anular  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Ficheiro/desprender"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Ficheiro/Novo carta_fol..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Ficheiro/Novo elemen_to..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Ficheiro/_Borrar"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Ficheiro/_Propiedades..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Ficheiro/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Ficheiro/_Pechar"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editar marcadores"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2089,92 +2074,91 @@ msgstr ""
 "Pode axustar os atributos do seu ficheiro(s)\n"
 "Nota: "
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Pegañento "
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Usuario"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Ler"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escribir"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Executar"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Outro"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Estas seguro de que queres eliminar estes %ld ficheiros e %ld directorios"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Está certo de querer eliminar estes %ld ficheiros?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Está certo de querer eliminar estes %ld cartafoles?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Eliminar Ficheiros/Directorios"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s recibida\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrastrar e soltar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Saír"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2182,468 +2166,455 @@ msgstr ""
 "Hai transferencias de ficheiros en progreso.\n"
 "Estás seguro de que queres saír?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Abrir localización"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduce unha URL á que conectarse"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/desprender"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Xanela _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Xanela _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binario"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferencias..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Saír"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/desprender"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Abrir ubicación..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_esconectar"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Cambiar _filtro..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Mostrar selección"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Seleccionar _todo"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Seleccionar tódolos ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselecionar todo"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Gardar listado de directorio..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Enviar orde SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Cambiar de directorio"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/_Novo cartafol..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Reno_mear..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Borrar..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/A_ctualizar"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remoto"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remoto/desprender"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remoto/_Abrir localización..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remoto/D_esconectar"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remoto/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remoto/Cambiar _filtro..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remoto/_Mostrar selección"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remoto/Seleccionar _todo"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remoto/Seleccionar todos os ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remoto/Deselecionar todo"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remoto/Gardar lista de cartafol..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remoto/Enviar orde SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remoto/_Cambiar de cartafol"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remoto/_Permisos..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Arquivo/_Novo cartafol..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remoto/Reno_mear..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remoto/_Borrar..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remoto/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remoto/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remoto/A_ctualizar"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Marcadores"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Marcadores/desprender"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Marcadores/Engadir _marcador"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Marcadores/Editar marcadores"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Marcadores/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferencias"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferencias/desprender"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferencias/_Iniciar"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferencias/_Deter"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferencias/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferencias/Omitir ficheiro a_ctual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferencias/Elimina_r ficheiro"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferencias/Mover ficheiro arri_ba"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferencias/Mover ficheiro abai_xo"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferencias/_Obter ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferencias/En_viar ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Rex_istros"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Rexistros/desprender"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Rexistros/_Limpar"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Rexistros/_Ver"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Rexistros/_Gardar..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Ferramentas"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Ferramentas/desprender"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Ferramentas/C_omparar xanelas"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Ferramentas/_Limpar caché"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Axuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Axuda/desprender"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Servidor: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Servidor: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Porto: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Usuario: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Usuario: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Contrasinal: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Orde: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributos"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Erro: Debe introducir un servidor o que conectar\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduce o nome de usuario"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Introduce o teu nome de usuario para este sitio"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Introduce o contrasinal para este lugar"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operación anulada...debe introducir unha cadea\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Crear un directorio"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduce o nome do directorio a crear"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Que nome lle quere dar a %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Sitio"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introduza ordes específicas do sitio"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Antepoñer co LUGAR"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Omitido"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Retomar"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Omitir"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferir ficheiros"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2651,59 +2622,59 @@ msgstr ""
 "Os ficheiros seguintes existen tanto no seu ordenador local coma no remoto\n"
 "Por favor, elixa que quere facer"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Omitir ficheiro"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Selecionar todo"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselecionar todo"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Cambiar filtro: Operación anulada... debe introducir unha cadea\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Cambiar filtro"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduza un novo filtro"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Erro: Non se puido abrir %s para escribir: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Gardar listado de directorios"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Erro: Erro escribindo en %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Escribiuse correctamente o rexistro do ficheiro a %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Gardar rexistro"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2712,11 +2683,11 @@ msgstr ""
 "Non se pode atopar o ficheiro COPYING que conten o acordo de licenza. "
 "Asegúrese de que está en %s ou en %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Acerca de gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2728,27 +2699,23 @@ msgstr ""
 "Official Homepage: http://www.gftp.org/\n";
 "Logo de: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Acerca de "
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Pechar  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparar xanelas"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desconecta do servidor remoto"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2757,72 +2724,56 @@ msgstr ""
 "servidor está en branco, entón preséntase un diálogo que lle permite "
 "introducir un URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tódolos ficheiros"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (En caché) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Non conectado"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Erro abrindo o ficheiro %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Non conectado ao sitio remoto\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Esta característica non está dispoñíbel para este protocolo\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Ti debes ter só un elemento seleccionado\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Só debe ter seleccionado un elemento\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Engadir"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Anular"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Si  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Non  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Obtendo listado de directorios"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Deter  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2831,109 +2782,89 @@ msgstr ""
 "Recibidos %ld cartafoles\n"
 "e %ld ficheiros"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Erro de gFTP: Non se puido atopar o ficheiro %s en %s ou %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editar servidor"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Engadir servidor"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Enderezo da rede"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Enderezo da rede:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Máscara de rede"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Máscara de r_ede:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Dominio:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Servidores locais"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opcións"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Recibindo o nome dos ficheiros..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Obter ficheiros: Non está conectado a un servidor remoto\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Erro: Proceso fillo %d devolveu %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "O proceso fillo %d finalizou correctamente\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Erro: Proceso fillo %d non rematou adecuadamente\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Erro: Non se puido obter información acerca do ficheiro %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "O ficheiro %s non foi cambiado\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2942,117 +2873,156 @@ msgstr ""
 "O ficheiro %s cambiou.\n"
 "Quere subilo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editar ficheiro"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Finalizado"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Enviados %s de %s a %.2fKB/s, tempo restante estim. %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recv %s de %s a %.2fKB/s, tempo restante estim. %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Enviados %s de %s, transferencia interrumpida, tempo restante descoñecido"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Recv %s de %s, transferencia interrompida, o tempo restante é descoñecido"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Porcentaxe completada descoñecida. (Ficheiro %ld de %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% completo, tempo restante estimado %02d:%02d:%02d. (Ficheiro %ld de %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Recibindo nomes de ficheiros... %s bytes"
 
-#: ../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
+#: 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 "Non hai ningunha transferencia seleccionada\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Ver"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editar"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Ver: %s é un directorio. Non se pode ver.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Editar: %s é un directorio. Non se pode editar.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Editar: Debes especificar un editor no diálogo de opcións\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Ver: Non se pode crear outro proceso: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Cargando programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Abrindo %s con %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Vendo ficheiro %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Ver: Non se puido abrir o ficheiro %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Non se pode abrir o terminal de control %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nome de usuario [anónimo]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s xa existe. (tamaño de orixe de %s, tamaño de destino de %s):\n"
 "s(o)breescribir, continua(r), (s)altar, S(O)breescribir todo, Continua(R) "
 "todo, (S)altar todo: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Anular  "
+
+#~ msgid "Host: "
+#~ msgstr "Servidor: "
+
+#~ msgid "User: "
+#~ msgstr "Usuario: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Pechar  "
+
+#~ msgid "Add"
+#~ msgstr "Engadir"
+
+#~ msgid "Cancel"
+#~ msgstr "Anular"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Si  "
+
+#~ msgid "  No  "
+#~ msgstr "  Non  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Network Address"
+#~ msgstr "Enderezo da rede"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
diff --git a/po/gu.po b/po/gu.po
index 6b6f57e..bd4e702 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&amp;component=general\n";
-"POT-Creation-Date: 2008-11-30 20:04+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-06-19 12:28+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,86 +23,86 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "અયોગ્ય URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ક્ષતિ: કેશ અનુક્રમણિકા ફાઈલમાં અયોગ્ય લીટી %s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "અક્ષર સમૂહ %s માંથી અક્ષર સમૂહ %s માં શબ્દમાળા '%s' ને રૂપાંતર કરતી વખતે ભૂલ: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ક્ષતિ: સ્થાનિક ફાઈલ %s ખોલી શકતા નથી: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ક્ષતિ: સોકેટમાં લખી શક્યા નહિં: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ક્ષતિ: સોકેટમાંથી વાંચી શક્યા નહિં: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "ચેતવણી: મુખ્ય બુકમાર્ક ફાઈલ %s શોધી શકતા નથી\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP ચેતવણી: બુકમાર્ક ફાઈલમાં લીટી %d સુધી અવગણી રહ્યા છીએ: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ચેતવણી: લીટી %d પાસે પૂરતી દલીલો નથી\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -111,7 +112,7 @@ msgstr ""
 "જવાની જરૂર પડશે નહિં (જો ઉપલબ્ધ હોય). વાક્યરચના: dont_use_proxy=.ડોમેઈન અથવા "
 "dont_use_proxy=નેટવર્ક નંબર/નેટમાસ્ક"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -119,52 +120,52 @@ msgstr ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. નોંધ: "
 "બધી દલીલો એ ફાઇલ એક્સટેન્શન વૈકલ્પિક છે તેને સ્વીકારે છે"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "શું તમે make install કર્યું હતું?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP ક્ષતિ: ખરાબ લોગ ફાઈલ નામ %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -172,7 +173,7 @@ msgstr ""
 "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"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -180,11 +181,11 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 "નોંધ: આ ફાઇલ ની અંદર સમાવેલ પાસવર્ડો અસ્તવ્યસ્ત થયેલ છે. આ ઍલ્ગરિધમ એ સુરક્ષિત નથી. "
-"તમારા ખભા પર કોઇક ઊભુ રહ્યુ હોય તે દ્દારા તમારા પાસવર્ડને સરળ રીતે યાદ કરવાનું અવગણાય તે માટે "
-"આ છે જ્યારે તમે આ ફાઇલમાં ફેરફાર કરી રહ્યા હોય. આ કરતા પહેલાં, બધા પાસવર્ડો એ સાદાલખાણમાં "
-"સંગ્રહેલ હતા."
+"તમારા ખભા પર કોઇક ઊભુ રહ્યુ હોય તે દ્દારા તમારા પાસવર્ડને સરળ રીતે યાદ કરવાનું અવગણાય "
+"તે માટે આ છે જ્યારે તમે આ ફાઇલમાં ફેરફાર કરી રહ્યા હોય. આ કરતા પહેલાં, બધા પાસવર્ડો એ "
+"સાદાલખાણમાં સંગ્રહેલ હતા."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -194,94 +195,93 @@ msgstr ""
 "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"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 "FATAL gFTP ક્ષતિ: રૂપરેખા વિકલ્પ '%s' વૈશ્વિક હેશ કોષ્ટકમાં મળ્યું નહિં\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ક્ષતિ: ફાઈલ %s અપલોડ કરી શકતા નથી\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ક્ષતિ: ફાઈલ %s પર લખી શકતા નથી: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ક્ષતિ: ફાઈલ બંધ કરતી વખતે ક્ષતિ: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP સર્વર માંથી ભંગાણ થયેલ ફાઇલ યાદી %s\n"
 
-#: ../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
+#: 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 "અજ્ઞાત"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP ડિરેક્ટરી યાદી %s મેળવી શક્યા નહિં: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "ડિરેક્ટરીને %s માં સફળતાપૂર્વક બદલી નાંખી\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "%s માં ડિરેક્ટરી બદલી શક્યા નહિં\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s સફળતાપૂર્વક દૂર કરાઈ\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ક્ષતિ: ફાઈલ %s દૂર કરી શક્યા નહિં: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -289,7 +289,7 @@ msgstr ""
 "FTPS આધાર બિનઉપલબ્ધ છે કારણ કે SSL આધાર કમ્પાઈલ થયેલ ન હતો. જોડાણ અડધેથી બંધ કરી "
 "રહ્યા છીએ.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -297,107 +297,105 @@ msgstr ""
 "HTTPS આધાર બિનઉપલબ્ધ છે કારણ કે SSL આધાર કમ્પાઈલ થયેલ ન હતો. જોડાણ અડધેથી બંધ કરી "
 "રહ્યા છીએ.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "વર્તમાન કામ આપતી ડિરેક્ટરી મેળવી શક્યા નહિં: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "સ્થાનિક ડિરેક્ટરીને %s માં સફળતાપૂર્વક બદલી નાંખી\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "%s માં સ્થાનિક ડિરેક્ટરી બદલી શક્યા નહિં: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ક્ષતિ: સ્થાનિક ફાઈલ %s અડધેથી બંધ કરી શકતા નથી: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "સ્થાનિક ડિરેક્ટરી યાદી %s મેળવી શક્યા નહિં: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ની સ્થિતિ %o માં બદલી\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ક્ષતિ: %s ની સ્થિતિને %o માં બદલી શક્યા નહિં: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s નાં સમય સ્ટેમ્પ સફળતાપૂર્વક બદલી\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ક્ષતિ: %s ની સમય સ્ટેમ્પને બદલી શક્યા નહિં: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "સ્થાનિક ફાઈલસિસ્ટમ"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "વપરાશ: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "કંઇ નહિ"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ફાઈલ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "માપ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "વપરાશકર્તા"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "જૂથ"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "તારીખસમય"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "લક્ષણો"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "ઊતરતા ક્રમમાં"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ચડતા ક્રમમાં"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "કાર્યક્રમ જુઓ:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -405,27 +403,27 @@ msgstr ""
 "ફાઈલો જોવા માટે વાપરવાનો મૂળભૂત કાર્યક્રમ. જો આ કોરું હોય, તો આંતરિક ફાઈલ દર્શક "
 "વાપરવામાં આવશે"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "કાર્યક્રમમાં ફેરફાર કરો:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ફાઈલોમાં ફેરપાર કરવા માટેનો મૂળભૂત કાર્યક્રમ."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "મહત્તમ લોગ વિન્ડો માપ:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "લોગ વિન્ડોનું મહત્તમ માપ બાઈટોમાં GTK+ પોર્ટ માટે"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "દૂરસ્થ અક્ષર સમૂહો:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -433,192 +431,202 @@ msgstr ""
 "આ અલ્પવિરામથી અલગ પડેલ અક્ષરસમૂહોની યાદી છે કે જે દૂરસ્થ સંદેશાઓને વર્તમાન લોકેલમાં ફેરવવાનો "
 "પ્રયાસ કરે છે"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "દૂરસ્થ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ની કિંમત છે. આ આ છે તેથી આ તારીખો ડિરેકટરી યાદીઓમાં યોગ્ય રીતે "
-"પદચ્છેદન કરી શકે છે."
+"આ દૂરસ્થા સાઇટ માટે LC_TIME ની કિંમત છે. આ આ છે તેથી આ તારીખો ડિરેકટરી યાદીઓમાં યોગ્ય "
+"રીતે પદચ્છેદન કરી શકે છે."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "કેશ TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "કેશ પ્રવેશો સાચવી રાખવાનો સમય સેકન્ડોમાં તેઓ નિવૃત્ત થાય તે પહેલાં."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ફાઈલ પરિવહનો ઉમેરો"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "હાલનામાં નવા ફાઈલ પરિવહનો ઉમેરો"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "એક સમયે એક જ પરિવહન કરો"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "શું માત્ર એક સમયે એક જ પરિવહન કરવા માંગો છો?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "મૂળભૂત રીતે ફરીથી લખો"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "મૂળભૂત રીતે ફાઈલો પર ફરીથી લખો અથવા ફાઈલ પરિવહનો ફરી શરૂ કરવા માટે સુયોજીત કરો"
+msgstr ""
+"મૂળભૂત રીતે ફાઈલો પર ફરીથી લખો અથવા ફાઈલ પરિવહનો ફરી શરૂ કરવા માટે સુયોજીત કરો"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ફાઈલ પરવાનગીઓ સાચવો"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "પરિવહન થયેલ ફાઈલોની ફાઈલ પરવાનગીઓ સાચવો"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ફાઈલ સમયને સાચવો"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "પરિવહન થયેલ ફાઈલોની ફાઈલ સમયો સાચવો"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "દર ફાઈલ પરિવહન પછી પુનઃતાજું કરો"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "દરેક ફાઈલ પરિવહન થાય પછી યાદીબોક્સ પુનઃતાજું કરો"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ડિરેક્ટરીઓ પ્રથમ ક્રમમાં ગોઠવો"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "ડિરેક્ટરીઓ પ્રથમ મૂકો પછી ફાઈલો"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "છુપી ફાઈલો બતાવો"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "યાદીબોક્સોમાં છુપી ફાઈલો બતાવો"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "શિર્ષકમાં પરિવહન સ્થિતિને બતાવો"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "શિર્ષકપટ્ટીમાં ફાઇલ પરિવહન સ્થિતિને બતાવો"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ફાઈલ પરિવહનને શરૂ કરો"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "આપમેળે ફાઇલ પરિવહનોને શરૂ કરો જ્યારે તેઓ કતાર થયેલ હોય તો"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI મેન્યુઅલ આદેશોને પરવાનગી આપો"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI માં જાતે જ આદેશોને દાખલ કરવાની પરવાનગી આપો (વિધેયો જેવુ કે લખાણ પોર્ટ)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "છેલ્લી ડિરેક્ટરીને યાદ રાખો"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "છેલ્લી સ્થાનિક અને દૂરસ્થ ડિરેક્ટરીનો સંગ્રહ કરો જ્યારે કાર્યક્રમ બંધ થયેલ હોય તો"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "શરૂઆત પર દૂરસ્થ સર્વર માં જોડાવો"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "આપોઆપ દૂરસ્થ સર્વરમાં જોડાવો જ્યારે કાર્યક્રમ શરૂ થયેલ હોય તો."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "નેટવર્ક"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "નેટવર્ક સમયસમાપ્ત:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "નેટવર્ક ઈનપુટ/આઉટપુટ માટે રાહ જોઈ રહેલ સમયસમાપ્ત. આ ફાજલ સમયસમાપ્તિ નથી."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "જોડાણ પુનઃપ્રયાસો:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "કરવાના આપોઆપ-પુનઃપ્રયાસોની સંખ્યા. અવ્યાખ્યાયિત રીતે પુનઃપ્રયાસ કરવા માટે આને ૦ માં "
 "સુયોજીત કરો"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "પુનઃપ્રયાસ ઉંઘ સમય:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "પુનઃપ્રયાસો વચ્ચે રાહ જોવાનો સમય સેકન્ડોમાં"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "મહત્તમ KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "મહત્તમ KB/s ફાઈલ પરિવહન મેળવી શકે. (નિષ્ક્રિય કરવા માટે ૦ માં સુયોજીત કરો)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "બ્લોક માપ નું પરિવહન કરો:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr "બ્લોક માપ કે જે જ્યારે ફાઇલોનું પરિવહન કરી રહ્યા હોય ત્યારે વાપરેલ છે. આ 1024 ની ઘણીબધી હોવી જોઇએ."
+msgstr ""
+"બ્લોક માપ કે જે જ્યારે ફાઇલોનું પરિવહન કરી રહ્યા હોય ત્યારે વાપરેલ છે. આ 1024 ની ઘણીબધી "
+"હોવી જોઇએ."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "મૂળભૂત પ્રોટોકોલ:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "આ વાપરવા માટેના મૂળભૂત પ્રોટોકોલને સ્પષ્ટ કરે છે"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 આધારને સક્રિય કરો"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -626,27 +634,27 @@ msgstr ""
 "આ વ્યાખ્યાયિત કરે છે કે શું થશે જ્યારે તમે ફાઈલ યાદીબોક્સોમાં ફાઈલ પર બેવડું ક્લિક કરો. "
 "૦=ફાઈલ જુઓ ૧=ફાઈલમાં ફેરફાર કરો ૨=ફાઈલ પરિવહન કરો"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "સ્થાનિક ફાઈલો યાદીબોક્સની મૂળભૂત પહોળાઈ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "દૂરસ્થ ફાઈલો યાદીબોક્સની મૂળભૂત પહોળાઈ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "સ્થાનિક/દૂરસ્થ ફાઈલો યાદીબોક્સની મૂળભૂત ઊંચાઈ"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "પરિવહન યાદીબોક્સની મૂળભૂત ઊંચાઈ"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "લોગીંગ વિન્ડો મૂળભૂત ઊંચાઈ"
 
-#: ../lib/options.h:177
+#: 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."
@@ -654,15 +662,15 @@ msgstr ""
 "પરિવહન વિન્ડોમાં ફાઈલનામ સ્તંભની પહોળાઈ. આને ૦ માં સુયોજીત કરો આ સ્તંભનું માપ આપોઆપ "
 "બદલવા માટે."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ક્રમમાં ગોઠવવા માટેનો મૂળભૂત સ્તંભ"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ચડતા કે ઊતરતા ક્રમમાં ગોઠવો"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -670,7 +678,7 @@ msgstr ""
 "ફાઈલ યાજીબોક્સોમાં ફાઈલનામ સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં "
 "સુયોજીત કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -678,7 +686,7 @@ msgstr ""
 "ફાઈલ યાદીબોક્કસોમાં માપ સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં "
 "સુયોજીત કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -686,7 +694,7 @@ msgstr ""
 "ફાઈલ યાદીબોક્કસોમાં વપરાશકર્તા સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં "
 "સુયોજીત કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -694,7 +702,7 @@ msgstr ""
 "ફાઈલ યાદીબોક્કસોમાં જૂથ સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં સુયોજીત "
 "કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -702,7 +710,7 @@ msgstr ""
 "ફાઈલ યાદીબોક્કસોમાં તારીખ સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં "
 "સુયોજીત કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,185 +718,186 @@ msgstr ""
 "ફાઈલ યાદીબોક્કસોમાં લક્ષણો સ્તંભની પહોળાઈ. આ સ્તંભનું માપ આપોઆપ બદલવા માટે આને ૦ માં "
 "સુયોજીત કરો. આ સ્તંભ નિષ્ક્રિય કરવા માટે આને -૧ માં સુયોજીત કરો"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "આદેશોનો રંગ કે જેઓ સર્વરને મોકલાયેલ છે"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "આદેશોનો રંગ કે જે સર્વરમાંથી મળ્યો"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ક્ષતિ સંદેશાઓનો રંગ"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "બાકીના લોગ સંદેશાઓનો રંગ"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "સ્થાનિક"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "બુકમાર્ક"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ફાઈલ પરિવહન %.2f KB/s ઝડપે પહોંચી જશે\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "'%s' માં LC_TIME ને સુયોજિત કરવામાં ભૂલ. '%s' માં પાછા પડી રહી છે\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "કેશ (LC_TIME=%s) માંથી ડિરેક્ટરી યાદી %s ને લોડ કરી રહ્યા છે\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "સર્વર (LC_TIME=%s) માંથી ડિરેક્ટરી યાદી %s ને લોડ કરી રહ્યા છે\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr ""
-"ચેતવણી: ફાઇલ '%s' નાં બંધ પાથને કાઢી રહ્યા છે. કાઢી નાંખેલ પાથ એ હાલની ડિરેક્ટરી (%s) ને "
-"બંધબેસતુ નથી (%s)\n"
+"ચેતવણી: ફાઇલ '%s' નાં બંધ પાથને કાઢી રહ્યા છે. કાઢી નાંખેલ પાથ એ હાલની ડિરેક્ટરી (%s) "
+"ને બંધબેસતુ નથી (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ક્ષતિ: કેશમાં લખી શકતા નથી: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ક્ષતિ: બુકમાર્ક %s શોધી શક્યા નહિં\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "બુકમાર્કો ક્ષતિ: બુકમાર્ક પ્રવેશ %s ને યજમાનનામ નથી\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "પ્રોટોકોલ '%s' વર્તમાનમાં આધારભૂત નથી.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "વારંવાર symbolic link %s શોધાઇ\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "ક્ષતિ: દૂરસ્થ સાઈટ %s નું જોડાણ તૂટી ગયું. મહત્તમ પ્રયાસોએ પહોંચી ગયા...છોડી રહ્યા છીએ\n"
+msgstr ""
+"ક્ષતિ: દૂરસ્થ સાઈટ %s નું જોડાણ તૂટી ગયું. મહત્તમ પ્રયાસોએ પહોંચી ગયા...છોડી રહ્યા છીએ\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "મુખ્ય pty %s ખોલી શકતા નથી: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "સોકેટ જોડી બનાવી શકતા નથી: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ક્ષતિ: ssh ચલાવી શકતા નથી: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "અન્ય પ્રક્રિયા પેદા કરી શકતા નથી: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "પ્રોક્સી યજમાનનામ:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ફાયરવોલ યજમાનનામ"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "પ્રોક્સી પોર્ટ:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ફાયરવોલ પર જોડાવા માટેનો પોર્ટ"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "પ્રોક્સી વપરાશકર્તાનામ:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "તમારું ફાયરવોલ વપરાશકર્તાનામ"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "પ્રોક્સી પાસવર્ડ:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "તમારો ફાયરવોલ પાસવર્ડ"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 વાપરો"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -897,65 +906,65 @@ msgstr ""
 "સર્વરમાંથી ખોટો પ્રત્યુત્તર મળ્યો, જોડાણ તોડી રહ્યા છીએ\n"
 "અયોગ્ય ચંક માપ '%s' એ દૂરસ્થ સર્વર પાસેથી મળ્યું\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ઓફસેટ આગળ ફાઈલ પરિવહન શરૂ કરી રહ્યા છીએ "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ફાઈલ %s પુનઃપ્રાપ્ત કરી શકતા નથી\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ડિરેક્ટરી યાદી પુનઃપ્રાપ્ત કરી રહ્યા છીએ...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "સર્વરમાંથી ખોટો પ્રત્યુત્તર મળ્યો, જોડાણ તોડી રહ્યા છીએ\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE આદેશ"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP પ્રોક્સી"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "વૈવિધ્યપૂર્ણ"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ઈમેઈલ સરનામું:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -963,19 +972,19 @@ msgstr ""
 "આ એ પાસવર્ડ છે કે જે જ્યારેપણ તમે દૂરસ્થ FTP સર્વરમાં અનામિક તરીકે પ્રવેશ કરો ત્યારે "
 "વાપરવામાં આવશે"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "પ્રોક્સી ખાતું:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "તમારું ફાયરવોલ ખાતું (વૈકલ્પિક)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "પ્રોક્સી સર્વર પ્રકાર:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -991,11 +1000,11 @@ msgstr ""
 "(વપરાશકર્તા), p (પાસવર્ડ), h (યજમાન), o (પોર્ટ) અથવા (ખાતું) હોઈ શકે. ઉદાહરણ તરીકે, "
 "પ્રોક્સી વપરાશકર્તા સ્પષ્ટ કરવા માટે, તમે %pu લખી શકો"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV સરનામાંને અવગણો"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1003,14 +1012,14 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 "જો આ સક્રિય થયેલ હોય તો, પછી દૂરસ્થ FTP સર્વરનું PASV IP સરનામાં ક્ષેત્રને અવગણી દેવામાં "
-"આવશે એને તેને બદલે યજમાનનાં IP સરનામાંને વાપરશે. PASV જવાબમાં તેનાં બહારનાં IP "
-"સરનામાં કરતા તેનાં આંતરિક આપી રહ્યા રહ્યા છે તે રાઉટરો માટે આની વારંવાર જરૂરિયાત છે."
+"આવશે એને તેને બદલે યજમાનનાં IP સરનામાંને વાપરશે. PASV જવાબમાં તેનાં બહારનાં IP સરનામાં "
+"કરતા તેનાં આંતરિક આપી રહ્યા રહ્યા છે તે રાઉટરો માટે આની વારંવાર જરૂરિયાત છે."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "પેસીવ ફાઈલ પરિવહન"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1025,11 +1034,11 @@ msgstr ""
 "આધાર નહિં આપે. જો આ નિષ્ક્રિય કરેલ હોય, તો પછી gFTP એ ક્લાઈન્ટ બાજુ પરનો પોર્ટ ખોલી "
 "નાંખશે અને દૂરસ્થ સર્વર તેની સાથે જોડાવાનો પ્રયાસ કરશે."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "દૂરસ્થ સીમલીંક ઉકેલે છે (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1040,15 +1049,16 @@ msgstr ""
 "સક્રિય છોડી મૂકવાનો વિચાર સારો છે. માત્ર એક જ સમયે તમે આને નિષ્ક્રિય કરવા માંગશો એ આ છે "
 "કે જે દૂરસ્થ FTP સર્વર LIST માટે -L વિકલ્પને આધાર આપતો નથી"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ફાઈલોને ASCII સ્થિતિમાં પરિવહન કરે છે"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1057,330 +1067,324 @@ msgstr ""
 "રજૂ કરે છે. જો તમે UNIX માંથી UNIX પરિવહન કરી રહ્યા હોય, તો પછીઆને બંધ રાખવાનું સુરક્ષિત "
 "છે. જો તમે બાઈનરી માહિતી ડાઉનલોડ કરી રહ્યા હોય તો તમે આને નિષ્ક્રિય કરવા માંગશો."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "IP સરનામું PASV પ્રત્યુત્તર '%s' માં શોધી શકતા નથી\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "IP સરનામું PASV પ્રત્યુત્તર માં અવગણી રહ્યા છે. %d.%d.%d.%d:%d માં જોડી રહ્યા છે\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "માહિતી જોડાણ બનાવી શકતા નથી: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "પોર્ટ બાંધી શકતા નથી: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6 સોકેટ બનાવવામાં નિષ્ફળ: %s\n"
 
-#: ../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:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"ક્ષતિ: એવું લાગતું નથી કે આપણે IPv6 મારફતે જોડાયેલ છીએ. જોડાણ અડધેથી બંધ કરી રહ્યા છીએ.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "અયોગ્ય EPSV પ્રત્યુત્તર '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "સ્થાનિક સોકેટનું સરનામું મેળવી શકતા નથી: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "સર્વરમાંથી જોડાણ સ્વીકારી શકતા નથી: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "કુલ"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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 માટે જોઈ શકતા નથી. મહેરબાની કરીને તમારી services ફાઈલ ચકાસો\n"
+msgstr ""
+"સેવા નામ %s/tcp માટે જોઈ શકતા નથી. મહેરબાની કરીને તમારી services ફાઈલ ચકાસો\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "સોકેટ ફ્લેગો મેળવી શકતા નથી: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "નહિં-અટકાવતા સોકેટ સુયોજીત કરી શકતા નથી: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH કાર્યક્રમ નામ:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH એક્ઝેક્યુટેબલનો પાથ"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH વધારાના પરિમાણો:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH કાર્યક્રમને પસાર કરવાના વધારાના પરિમાણો"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH વપરાશકર્તા/પાસવર્ડ જરૂરી છે"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH જોડાણો માટે વપરાશકર્તાનામ/પાસવર્ડ જરૂરી છે"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "કાર્યક્રમ %s ચલાવી રહ્યા છીએ\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA કી માટે પાસફ્રેઝને દાખલ કરો"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "કી માટે પાસફ્રેઝને દાખલ કરો '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "પાસવર્ડ"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "પાસવર્ડ"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(હા/ના)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE ને દાખલ કરો:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "પાસવર્ડ દાખલ કરો"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID પાસવર્ડને દાખલ કરો:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ક્ષતિ: અયોગ્ય પાસવર્ડ દાખલ થયો હતો\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: પ્રોટોકોલ આરંભ\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: પ્રોટોકોલ આવૃત્તિ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s ખોલો\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: બંધ કરો\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: ડિરેક્ટરી %s ખોલો\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ડિરેક્ટરી વાંચો\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ફાઈલ %s દૂર કરો\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: ડિરેક્ટરી %s બનાવો\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ડિરેક્ટરી %s દૂર કરો\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: વાસ્તવિકપાથ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ફાઈલ લક્ષણો\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "બરાબર"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "આવી કોઈ ફાઈલ કે ડિરેક્ટરી નથી"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "પરવાનગી નથી"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "નિષ્ફળતા"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ખરાબ સંદેશો"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "કોઈ જોડાણ નથી"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "જોડાણ નષ્ટ થયું"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "પ્રક્રિયા બિનઆધારભૂત"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "સર્વરમાંથી અજ્ઞાત સંદેશો મળ્યો"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ક્ષતિ: સંદેશા માપ %d ખૂબ મોટું છે\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1388,41 +1392,41 @@ msgstr ""
 "દૂરસ્થ સર્વર સાથે SSH જોડાણનો આરંભ કરવામાં ક્ષતિ હતી. દૂરસ્થ સર્વરમાંથી ક્ષતિ સંદેશો આને "
 "અનુસરે છે:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s નું SSH જોડાણ ખોલી રહ્યા છીએ\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH સર્વર %s માં સફળતાપૂર્વક પ્રવેશ્યા\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL એંજીન"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL એન્ટ્રોપી ફાઈલ:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL એન્ટ્રોપી ફાઈલ"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "એન્ટ્રોપી સીડ લંબાઈ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL એંજીન સાથે સીડ કરવા માટે મહત્તમ સંખ્યાના બાઈટો"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL પિઅર ને ચકાસો"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1435,11 +1439,11 @@ msgstr ""
 "વિષય = %s\n"
 "ક્ષતિ %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "સમકક્ષ પ્રમાણપત્ર મેળવી શકતા નથી\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1448,45 +1452,45 @@ msgstr ""
 "ક્ષતિ: SSL પ્રમાણપત્ર (%s) માં યજમાન યજમાન સાથે બંધબેસતું નથી કે જેની સાથે આપણે જોડાયેલ "
 "છીએ (%s). જોડાણ અડધેથી બંધ કરી રહ્યા છીએ.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL લાઈબ્રેરીનો આરંભ કરી શકતા નથી\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "મૂળભૂત SSL પ્રમાણપત્રો લાવવામાં ક્ષતિ\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "સાયફર યાદી સુયોજીત કરવામાં ક્ષતિ (કોઈ માન્ય સાયફરો નથી)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ક્ષતિ: SSL એંજીનનો આરંભ થયો ન હતો\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL જોડાણ સુયોજીત કરવામાં ક્ષતિ (BIO ઓબ્જેક્ટ)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL જોડાણ સુયોજીત કરવામાં ક્ષતિ (SSL ઓબ્જેક્ટ)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "સમકક્ષ પ્રમાણપત્ર સાથે ક્ષતિ: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "પ્રક્રિયા રદ થઈ\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "%d સેકન્ડો રાહ જોઈ રહ્યા છીએ જ્યાં સુધી ફરીથી પ્રયાસ કરવાનો પ્રયાસ કરો\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1496,73 +1500,73 @@ msgstr ""
 "છે, અને તેને ચોક્કસ શરતો હેઠળ પુનઃવિતરિત કરવામાં તમારું સ્વાગત છે; વિગતો માટે, COPYING "
 "ફાઈલ જુઓ\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "અનુવાદક"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "વપરાશ: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "વપરાશ: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "વપરાશ: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "વપરાશ: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "વપરાશ: સાઇટ <સાઇટ આદેશ>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "વપરાશ: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "વપરાશ: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "અયોગ્ય દલીલ\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ડિરેક્ટરી કેશ સાફ કરો\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "વપરાશ: ખોલો "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "વપરાશ: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ક્ષતિ: ચલ %s એ માન્ય રૂપરેખાંકન ચલ નથી.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1570,321 +1574,322 @@ msgstr ""
 "આધારભૂત આદેશો:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "વપરાશ: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "વિશે"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP જાણકારી બતાવે છે"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "વર્તમાન ફાઈલ પરિવહન સ્થિતિને Ascii માં સુયોજીત કરે છે (માત્ર FTP માટે)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "બાઈનરી"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "વર્તમાન ફાઈલ પરિવહન સ્થિતિને બાઈનરીમાં સુયોજીત કરે છે (માત્ર FTP માટે)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "દૂરસ્થ કામ આપતી ડિરેક્ટરી બદલે છે"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "દૂરસ્થ ફાઈલની પરવાનગીઓ બદલે છે"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "સાફ કરો"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ઉપલબ્ધ વિકલ્પો: કેશ"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "બંધ કરો"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "દૂરસ્થ સાઈટમાંથી જોડાણ તોડે છે"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "કાઢી નાંખો"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "દૂરસ્થ ફાઈલ દૂર કરે છે"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "વર્તમાન દૂરસ્થ ડિરેક્ટરી માટે ડિરેક્ટરી યાદી બતાવે છે"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "દૂરસ્થ ફાઈલ(ઓ) ડાઉનલોડ કરે છે"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "મદદ"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "આ મદદ સ્ક્રીન બતાવે છે"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "સ્થાનિક કામ આપતી ડિરેક્ટરી બદલે છે"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "સ્થાનિક ફાઈલની પરવાનગીઓ બદલે છે"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "સ્થાનિક ફાઈલ દૂર કરે છે"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "વર્તમાન સ્થાનિક ડિરેક્ટરી માટે ડિરેક્ટરી યાદી બતાવે છે"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "સ્થાનિક ડિરેક્ટરી બનાવે છે"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "વર્તમાન સ્થાનિક ડિરેક્ટરી બતાવો"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "સ્થાનિક ફાઈલનું નામ બદલો"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "સ્થાનિક ડિરેક્ટરી દૂર કરે છે"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "દૂરસ્થ ડિરેક્ટરી બનાવે છે"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "સ્થાનિક ફાઈલ(ઓ) અપલોડ કરે છે"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "ખોલો"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "દૂરસ્થ સાઈટ સાથેનું જોડાણ ખોલે છે"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "વર્તમાન દૂરસ્થ ડિરેક્ટરી બતાવો"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "બહાર નીકળો"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP માંથી બહાર નીકળો"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "નામ બદલો"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "દૂરસ્થ ફાઈલનું નામ બદલો"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "દૂરસ્થ ડિરેક્ટરી દૂર કરે છે"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "સુયોજીત"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "રૂપરેખાંકન ફાઈલ ચલો બતાવો. તમે ચલો var=val સુયોજીત કરીને પણ ચલો સુયોજીત કરી શકશો"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"રૂપરેખાંકન ફાઈલ ચલો બતાવો. તમે ચલો var=val સુયોજીત કરીને પણ ચલો સુયોજીત કરી શકશો"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "સાઇટ"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "સાઇટ ચોક્કસ આદેશને ચલાવો"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ક્ષતિ: આદેશ ઓળખાયેલ નથી\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ફાઈલ %s ને યજમાન %s પર અવગણી રહ્યા છીએ\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "યજમાન %s પર પરિવહન અટકાવી રહ્યા છીએ\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s ને %s માંથી ડાઉનલોડ કરી શક્યા નહિં\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"ત્યાં %d ફાઇલો અથવા ડિરેક્ટરીઓ હતી કે જે પરિવહન કરી શક્યા નહિં. કઇ વસ્તુઓ યોગ્ય રીતે પરિવહન કરી શકાઇ "
-"નથી તે માટે લોગને ચકાસો."
+"ત્યાં %d ફાઇલો અથવા ડિરેક્ટરીઓ હતી કે જે પરિવહન કરી શક્યા નહિં. કઇ વસ્તુઓ યોગ્ય રીતે "
+"પરિવહન કરી શકાઇ નથી તે માટે લોગને ચકાસો."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: બીજું કંઈપણ કરવા પહેલાં મહેરબાની કરીને અટકાવો બટન દબાવો\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "બુકમાર્ક ચલાવો"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "બુકમાર્ક ઉમેરો: તમારે બુકમાર્ક માટે નામ દાખલ કરવું જ પડશે\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "બુકમાર્ક ઉમેરો: બુકમાર્ક %s મેળવી શકતા નથી કારણ કે તે નામ પહેલાથી જ હાજર છે\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "બુકમાર્ક ઉમેરો"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "બુકમાર્ક ઉમેરો: તમારે યજમાનનામ દાખલ કરવું જ પડશે\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1894,31 +1899,31 @@ msgstr ""
 "તમે વસ્તુઓને / ને તેના ઉપમેનુમાં મૂકીને અલગ કરી શકો છો\n"
 "(દાત: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "પાસવર્ડ યાદ રાખો"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "બુકમાર્ક માટે નામ ને સ્પષ્ટ કરવુ જ પડશે."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "નવું ફોલ્ડર"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "બનાવવા માટેના નવા ફોલ્ડરનું નામ દાખલ કરો"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "નવી વસ્તુ"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "બનાવવા માટેની નવી વસ્તુનું નામ દાખલ કરો"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1927,106 +1932,99 @@ msgstr ""
 "શું તમે ખરેખર બુકમાર્ક\n"
 "%s અને તેના બધા બાળકો દૂર કરવા માંગો છો?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "બુકમાર્ક કાઢી નાંખો"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "બુકમાર્કો"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "પ્રવેશમાં ફેરફાર કરો"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "વર્ણન:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "યજમાનનામ:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "પોર્ટ:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "પ્રોટોકોલ:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "દૂરસ્થ ડિરેક્ટરી:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "સ્થાનિક ડિરેક્ટરી:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "વપરાશકર્તાનામ:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "પાસવર્ડ:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "ખાતું:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  રદ કરો  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ફાઈલ (_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ફાઈલ/કાપો"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ફાઈલ/નવું ફોલ્ડર (_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ફાઈલ/નવી વસ્તુ (_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ફાઈલ/કાઢો (_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ફાઈલ/ગુણધર્મો (_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ફાઈલ/વિભાજક"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ફાઈલ/બંધ કરો (_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "બુકમાર્કોમાં ફેરફાર કરો"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2034,91 +2032,90 @@ msgstr ""
 "તમે તમારી ફાઈલ(ઓ)નો લક્ષણો હવે સંતુલિત કરી શકો છો\n"
 "નોંધ: બધા ftp સર્વરો chmod લક્ષણને આધાર આપતા નથી"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "વિશિષ્ટ"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "વપરાશકર્તા"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "વાંચો"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "લખો"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ચલાવો"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "જૂથ"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "અન્ય"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "શું તમે ખરેખર આ %ld ફાઈલો અને %ld ડિરેક્ટરીઓ કાઢી નાંખવા માંગો છો"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "શું તમે ખરેખર આ %ld ફાઈલો કાઢી નાંખવા માંગો છો"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "શું તમે ખરેખર આ %ld ડિરેક્ટરીઓને કાઢી નાંખવા માંગો છો"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ફાઈલો/ડિરેક્ટરીઓ કાઢો"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "કાઢો"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "જોડો"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s મળી\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ખેંચો-ને-મૂકો"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "બહાર નીકળો"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2126,468 +2123,455 @@ msgstr ""
 "ત્યાં ફાઈલ પરિવહનો પ્રગતિમાં છે.\n"
 "શું તમે ખરેખર બહાર નીકળવા માંગો છો?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "સ્થાનને ખોલો"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "જોડાવા માટે URL દાખલ કરો"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/વિન્ડો 1 (_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/વિન્ડો 2 (_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/વિભાજક"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii (_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/બાઈનરી (_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/ફાઈલ/ગુણધર્મો (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/બહાર નીકળો (_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/સ્થાનિક (_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/સ્થાનિક/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/સ્થાનિક/સ્થાનને ખોલો (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/સ્થાનિક/જોડાણ તોડો (_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/સ્થાનિક/વિભાજક"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/સ્થાનિક/Filespec બદલો (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/સ્થાનિક/પસંદિત બતાવો (_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/સ્થાનિક/બધું પસંદ કરો (_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/સ્થાનિક/બધી ફાઈલો પસંદ કરો"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/સ્થાનિક/બધું નાપસંદ કરો"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/સ્થાનિક/ડિરેક્ટરી યાદી સંગ્રહો..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/સ્થાનિક/SITE આદેશ મોકલો..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/સ્થાનિક/ડિરેક્ટરી બદલો (_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/સ્થાનિક/પરવાનગીઓ (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ફાઈલ/નવું ફોલ્ડર (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/સ્થાનિક/નામ બદલો (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/સ્થાનિક/કાઢો (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/સ્થાનિક/ફેરફાર કરો (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/સ્થાનિક/દેખાવ (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/સ્થાનિક/પુનઃતાજું કરો (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/દૂરસ્થ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/દૂરસ્થ/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/દૂરસ્થ/સ્થાનને ખોલો (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/દૂરસ્થ/જોડાણ તોડો (_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/દૂરસ્થ/વિભાજક"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/દૂરસ્થ/Filespec બદલો (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/દૂરસ્થ/પસંદિત બતાવો (_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/દૂરસ્થ/બધું પસંદ કરો (_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/દૂરસ્થ/બધી ફાઈલો પસંદ કરો"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/દૂરસ્થ/બધું નાપસંદ કરો"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/દૂરસ્થ/ડિરેક્ટરી યાદી સંગ્રહો..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/દૂરસ્થ/SITE આદેશ મોકલો..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/દૂરસ્થ/ડિરેક્ટરી બદલો (_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/દૂરસ્થ/પરવાનગીઓ (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/દૂરસ્થ/નવું ફોલ્ડર (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/દૂરસ્થ/નામ બદલો (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/દૂરસ્થ/કાઢો (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/દૂરસ્થ/ફેરફાર કરો (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/દૂરસ્થ/દેખાવ (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/દૂરસ્થ/પુનઃતાજું કરો (_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/બુકમાર્કો (_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/બુકમાર્કો/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/બુકમાર્કો/બુકમાર્ક ઉમેરો (_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/બુકમાર્કો/બુકમાર્કોમાં ફેરફાર કરો"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/બુકમાર્કો/વિભાજક"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/પરિવહન (_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/પરિવહન/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/પરિવહન/શરૂ કરો (_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/પરિવહન/બંધ કરો (_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/પરિવહન/વિભાજક"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/પરિવહનો/વર્તમાન ફાઈલ અવગણો (_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/પરિવહન/ફાઈલ દૂર કરો (_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/પરિવહન/ફાઈલ ઉપર ખસેડો (_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/પરિવહન/ફાઈલ નીચે ખસેડો (_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/પરિવહન/ફાઈલો પુનઃપ્રાપ્ત કરો (_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/પરિવહન/ફાઈલો મૂકો (_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/લોગ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/પ્રવેશવાનું/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/પ્રવેશવાનું/સાફ કરો (_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/પ્રવેશવાનું/દેખાવ (_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/પ્રવેશવાનું/સંગ્રહો (_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/સાધનો (_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/સાધનો/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/સાધનો/વિન્ડો સરખાવો (_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/સાધનો/કેશ સાફ કરો (_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/મદદ"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/મદદ/કાપો"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/મદદ/વિશે (_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "યજમાન: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "યજમાન (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "પોર્ટ: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "વપરાશકર્તા: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "વપરાશકર્તા (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "પાસવર્ડ: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "આદેશ: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ફાઈલનામ"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "માપ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "તારીખ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "લક્ષણો"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "પ્રગતિ"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ક્ષતિ: તમારે જોડાણ કરવા માટે યજમાન લખવું જ પડશે\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "પુનઃતાજું કરો"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "વપરાશકર્તાનામ ને દાખલ કરો"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "મહેરબાની કરીને આ સાઈટ માટે તમારુ વપરાશકર્તાનામને દાખલ કરો"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "મહેરબાની કરીને આ સાઈટ માટે તમારો પાસવર્ડ દાખલ કરો"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "પ્રક્રિયા રદ થઈ...તમારે શબ્દમાળા દાખલ કરવી જ પડશે\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "ડિરેક્ટરી બનાવો"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "બનાવવા માટેની ડિરેક્ટરીનું નામ દાખલ કરો"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "નામ બદલો"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "તમે %s નું નામ શામાં બદલવા માંગો છો?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "સાઈટ"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "સાઈટ-લગતો આદેશ દાખલ કરો"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE સાથે જોડો"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "તેના પર ફરીથી લખવું"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "ફરીથી કરો"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "અવગણો"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "ક્રિયા"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ફાઈલો પરિવહન કરો"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2595,59 +2579,59 @@ msgstr ""
 "નીચેની ફાઈલ(ઓ) સ્થાનિક અને દૂરસ્થ કમ્પ્યૂટર બંને પર અસ્તિત્વમાં છે\n"
 "મહેરબાની કરીને પસંદ કરો કે તમે શું કરવા માંગો છો"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ભૂલ"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ફાઈલ અવગણો"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "બધું પસંદ કરો"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "બધું નાપસંદ કરો"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec બદલો: પ્રક્રિયા રદ કરેલ છે...તમારે શબ્દમાળા દાખલ કરવી જ પડશે\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec બદલો"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ક્ષતિ: %s ને ખોલવા માટે ખોલી શકતા નથી: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ડિરેક્ટરી યાદી સંગ્રહો"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ક્ષતિ: %s માં લખતી વખતે ક્ષતિ: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s માં સફળતાપૂર્વક લોગ ફાઈલ લખી\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "લોગ સંગ્રહો"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2656,11 +2640,11 @@ msgstr ""
 "લાઈસન્સ મંજૂરીપત્ર ફાઈલ COPYING શોધી શકતા નથી. મહેરબાની કરીને ખાતરી કરો કે તે ક્યાં તો "
 "%s અથવા %s માં છે"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP વિશે"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2671,100 +2655,80 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "વિશે"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  બંધ કરો  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "વિન્ડો સરખાવો"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "દૂરસ્થ સર્વર માંથી જોડાણ તોડે છે"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
-"યજમાન પ્રવેશમાં સ્પષ્ટ થયેલ સાઇટમાં જોડાવો. જો યજમાન પ્રવેશ ખાલી હોય તો, "
-"પછી સંવાદ એ રજૂઆત થયેલ છે કે જે URL ને પ્રવેશ કરવા માટે પરવાનગી આપશે."
+"યજમાન પ્રવેશમાં સ્પષ્ટ થયેલ સાઇટમાં જોડાવો. જો યજમાન પ્રવેશ ખાલી હોય તો, પછી સંવાદ એ "
+"રજૂઆત થયેલ છે કે જે URL ને પ્રવેશ કરવા માટે પરવાનગી આપશે."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "બધી ફાઈલો"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (કેશ થયેલ) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "જોડાયેલ નથી"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ફાઈલ %s ખોલવામાં ક્ષતિ: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: દૂરસ્થ સાઈટ સાથે જોડાયેલ નથી\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: આ લક્ષણ આ પ્રોટોકોલની મદદથી ઉપલબ્ધ નથી\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: તમારી પાસે એક વસ્તુ પસંદ થયેલ હોવી જ જોઈએ\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: તમારી પાસે ઓછામાં ઓછી એક વસ્તુ પસંદ થયેલ છે\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "બદલો"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "ઉમેરો"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "રદ કરો"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  હા  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  ના  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ડિરેક્ટરી યાદી મેળવી રહ્યા છીએ"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  અટકાવો  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2773,109 +2737,89 @@ msgstr ""
 "%ld ડિરેક્ટરીઓ\n"
 "અને %ld ફાઈલો મળી"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP ક્ષતિ: ફાઈલ %s ને %s માં અથવા %s માં શોધી શકતા નથી\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "યજમાનમાં ફેરફાર કરો"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "યજમાન ઉમેરો"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "પ્રકાર:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "પ્રકાર (_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ડોમેઈન"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "નેટવર્ક સરનામું"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "નેટવર્ક સરનામું (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "નેટમાસ્ક"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "નેટમાસ્ક (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ડોમેઈન (_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "નેટમાસ્ક"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "સ્થાનિક યજમાનો"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "ફેરફાર"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "ફેરફાર કરો (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "વિકલ્પો"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "લાગુ કરો"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ફાઈલ નામો મેળવી રહ્યા છીએ..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "જોડાઈ રહ્યા છીએ..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ફાઈલો પુનઃપ્રાપ્ત કરો: દૂરસ્થ સાઈટમાં જોડાયેલ નથી\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ક્ષતિ: બાળ %d ને %d મળ્યું\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "બાળ %d એ સફળતાપૂર્વક આપ્યું\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "ક્ષતિ: બાળ %d ને યોગ્ય રીતે અંત આવ્યો નહિં\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ક્ષતિ: ફાઈલ %s વિશે જાણકારી મેળવી શકતા નથી: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ફાઈલ %s બદલાયેલ ન હતી\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2884,115 +2828,153 @@ msgstr ""
 "ફાઈલ %s બદલાઈ ગઈ.\n"
 "શું તમે તેને અપલોડ કરવા ઈચ્છો છો?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ફાઈલમાં ફેરફાર કરો"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "સમાપ્ત થયું"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s જેટલું %s માંથી %.2fKB/s આગળ મળ્યું, %02d:%02d:%02d અંદાજીત સમય બાકી"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s જેટલા %s માંથી મોકલ્યા, પરિવહન અટકાવાયું, અજ્ઞાત સમય બાકી"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s જેટલા %s માંથી મળ્યા, પરિવહન અટકાવાયું, અજ્ઞાત સમય બાકી"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "અજ્ઞાત ટકાવાકી સમાપ્ત. (%ld ની ફાઇલ %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 અંદાજીત સમય બાકી. (ફાઈલ %ld જેટલી %ld માંથી)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ફાઈલ નામો પુનઃપ્રાપ્ત કરી રહ્યા છીએ...%s બાઈટો"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "દેખાવ"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "ફેરફાર"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "દેખાવ: અન્ય પ્રક્રિયા પેદા કરી શકતા નથી: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "કાર્યક્રમ ચલાવી રહ્યા છીએ: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ને %s સાથે ખોલી રહ્યા છીએ\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ફાઈલ %s જોઈ રહ્યા છીએ\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "દેખાવ: ફાઈલ %s ખોલી શકતા નથી: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "ટર્મિનલ %s નિયંત્રણ કરવાનું ખોલી શકતા નથી\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "વપરાશકર્તાનામ [નામ વિનાનું]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s પહેલેથી અસ્તિત્વ ધરાવે છે. (%s સ્ત્રોત માપ, %s લક્ષ્ય માપ):\n"
-"(o)ઉપર લખો, (r) પુન:શરૂ કરો, (s)છોડી દો, (O)બધા ઉપર લખો, (R)બધુ પુન:શરૂ કરો, (S)બધુ છોડી દો: (%"
-"c)"
+"(o)ઉપર લખો, (r) પુન:શરૂ કરો, (s)છોડી દો, (O)બધા ઉપર લખો, (R)બધુ પુન:શરૂ કરો, (S)"
+"બધુ છોડી દો: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  રદ કરો  "
+
+#~ msgid "Host: "
+#~ msgstr "યજમાન: "
+
+#~ msgid "User: "
+#~ msgstr "વપરાશકર્તા: "
+
+#~ msgid "  Close  "
+#~ msgstr "  બંધ કરો  "
+
+#~ msgid "Add"
+#~ msgstr "ઉમેરો"
+
+#~ msgid "Cancel"
+#~ msgstr "રદ કરો"
+
+#~ msgid "  Yes  "
+#~ msgstr "  હા  "
+
+#~ msgid "  No  "
+#~ msgstr "  ના  "
+
+#~ msgid "Type:"
+#~ msgstr "પ્રકાર:"
+
+#~ msgid "Network Address"
+#~ msgstr "નેટવર્ક સરનામું"
+
+#~ msgid "_Edit"
+#~ msgstr "ફેરફાર કરો (_E)"
 
+#~ msgid "Apply"
+#~ msgstr "લાગુ કરો"
diff --git a/po/he.po b/po/he.po
index 334a1eb..5147956 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,156 +6,162 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-07 03:43+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-09-04 15:54+0000\n"
 "Last-Translator: Revan <mark125 gmail com>\n"
 "Language-Team: Hebrew <he li org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2007-10-11 23:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "כתובת לא חוקית %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "שגיאה: שורה לא חוקית %s בקובץ האינדקס של המטמון\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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:3209
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "שגיאה: לא ניתן לפתוח קובץ מקומי %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2910 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "שגיאה: לא ניתן לכתוב לסוקט: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2831 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../lib/config_file.c:599
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:609
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../lib/config_file.c:665
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:672
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:678
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -163,828 +169,767 @@ 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 ""
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:392 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 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 ""
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, fuzzy, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "שגיאה: לא ניתן ליצור את התיקייה %s:·%s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1586
-#: ../lib/protocols.c:1587 ../lib/protocols.c:1628 ../lib/protocols.c:1629
-#: ../lib/protocols.c:1695 ../lib/protocols.c:1702 ../lib/protocols.c:1778
-#: ../lib/protocols.c:1779 ../lib/protocols.c:1815
+#: 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 ""
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, fuzzy, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "שגיאה: לא ניתן ליצור את התיקייה %s:·%s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, fuzzy, c-format
 msgid "Could not change directory to %s\n"
 msgstr "שגיאה: לא ניתן ליצור את התיקייה %s:·%s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: ../lib/ftps.c:157
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr ""
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr ""
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr ""
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, fuzzy, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "שגיאה: לא ניתן ליצור את התיקייה %s:·%s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr ""
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, fuzzy, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "שגיאה: לא ניתן ליצור את התיקייה %s:·%s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "מערכת-קבצים מקומית"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr ""
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ללא"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "קובץ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "גודל"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "שם משתמש"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "קבוצה"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "תאריך"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "כללי"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "תוכנת הצגת קבצים:"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "תוכנת עריכת קבצים:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr ""
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "גודל חלון לוגים מקסימלי:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr ""
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "מטמון TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "צרף קבצים (ראה תיאור)"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "בצע העברה אחד בלבד באותה העת"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr ""
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "תמיד כתוב על קבצים בעלי שם זהה"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "שמור הרשאות קבצים"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
-msgstr ""
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
+msgstr "שמור הרשאות קבצים"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 #, fuzzy
 msgid "Preserve file time"
 msgstr "שמור הרשאות קבצים"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
-msgstr ""
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "שמור הרשאות קבצים"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "רענן לאחר כל קובץ מועבר"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
-msgstr ""
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
+msgstr "רענן לאחר כל קובץ מועבר"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "סידור: תיקיות קודם"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "הצג קבצים מוסתרים"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "הצג מצב העברה בכותרת"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr ""
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "התחל אוטומטית העברות העומדות בתור"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "אשר פקודות ידניות בממשק"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 #, fuzzy
 msgid "Remember last directory"
 msgstr "זכור ססמא"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr ""
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "תקשורת"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr ""
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "פרוטוקול ברירת מחדל:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "הפעל תמיכת IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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 ""
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: ../lib/options.h:177
+#: 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 ""
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr ""
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "מקומי"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "מועדף"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:235
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: ../lib/protocols.c:388
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: ../lib/protocols.c:409
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: ../lib/protocols.c:472
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:699
+#: lib/protocols.c:450
 #, 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:730
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:763
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:770
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: ../lib/protocols.c:892 ../lib/protocols.c:919
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: ../lib/protocols.c:1209 ../lib/protocols.c:1224 ../lib/protocols.c:2406
-#: ../lib/protocols.c:2519
-#, c-format
-msgid "Looking up %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:1215 ../lib/protocols.c:1230 ../lib/protocols.c:2411
-#: ../lib/protocols.c:2524
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2141
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:2429
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2435 ../lib/protocols.c:2541
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr ""
-
-#: ../lib/protocols.c:2440 ../lib/protocols.c:2548
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2478 ../lib/rfc959.c:706
+#: lib/protocols.c:1531
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: ../lib/protocols.c:2502 ../lib/sshv2.c:1168
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: ../lib/protocols.c:2564 ../lib/protocols.c:3218 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
+#: lib/protocols.c:1634 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 ""
 
-#: ../lib/protocols.c:2571
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr ""
-
-#: ../lib/protocols.c:2807 ../lib/protocols.c:2885 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: ../lib/protocols.c:2955
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2969
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:3115
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: ../lib/protocols.c:3123
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr ""
-
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "שרת הProxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "פורט הProxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "משתמש הProxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "משתמש חומת-האש שלך"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ססמת הProxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ססמת חומת-האש שלך"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "השתמש בHTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 #, fuzzy
 msgid "Starting the file transfer at offset "
 msgstr "התחל אוטומטית העברות העומדות בתור"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "פקודת SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr ""
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr ""
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "דוא\"ל:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "חשבון הProxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "חשבון חומת-האש שלך (אופציונלי)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "סוג שרת Proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -995,11 +940,11 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr ""
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1007,11 +952,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1021,11 +966,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1033,325 +978,376 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr ""
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:903
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr ""
 
-#: ../lib/rfc959.c:1594
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr ""
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr ""
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr ""
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr ""
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr ""
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "סיסמה:"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "סיסמה"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr ""
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr ""
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "הכנס סיסמה:"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 #, fuzzy
 msgid "Enter SecurID Password:"
 msgstr "הזן ססמא :"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "אישור"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "לא נמצאה קובץ או תיקייה"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "גישה נדחתה"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr ""
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 ""
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "מנוע SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr ""
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr ""
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr ""
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1360,455 +1356,447 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: ../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 "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:720
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "אודות"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "בינארי"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "שנה הרשאות"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "נקה"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "סגור"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "מחק"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "עזרה"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "פתח"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "יציאה מgFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "שנה שם"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "אתר"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "פתח סימניה"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "הוסף סימניה"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1818,143 +1806,136 @@ msgstr ""
 "הינך יכול לסדר אותו בתת-תפריט ע\"י כתיבת / אחרי השם הרצוי, \n"
 "(לדוגמא : Linux-Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "זכור סיסמה"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "תיקייה חדשה"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "שם התיקיה החדשה :"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 #, fuzzy
 msgid "New Item"
 msgstr "/קובץ/פריט חדש"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "שם הפריט החדש :"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 msgstr "ברצונך למחוק %ld קבצים ו %ld תיקיות אלו?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "מחק סימניה"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "סימניות"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "שרת:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "פורט:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "תיקיה מרוחקת:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "תיקייה מקומית:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "חשבון:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "התחבר כאנונימי"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "ביטול"
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_קובץ"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 #, fuzzy
 msgid "/File/New _Folder..."
 msgstr "/קובץ/תיקיה חדשה"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 #, fuzzy
 msgid "/File/New _Item..."
 msgstr "/קובץ/פריט חדש"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 #, fuzzy
 msgid "/File/_Delete"
 msgstr "/קובץ/מחק"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 #, fuzzy
 msgid "/File/_Properties..."
 msgstr "/קובץ/מאפיינים"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 #, fuzzy
 msgid "/File/_Close"
 msgstr "/קובץ/סגור"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "ערוך סימניות"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "שנה הרשאות"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1962,91 +1943,90 @@ msgstr ""
 "הינך יכול לשנות הרשאות קבציך \n"
 "הערה: לא כל שרתי הFTP תומכים באפשרות שינוי ההרשאות."
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "מיוחד"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "דביק"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "משתמש"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "קריאה"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "כתיבה"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "הרצה"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "אחר"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "ברצונך למחוק %ld קבצים ו %ld תיקיות אלו?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, fuzzy, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "ברצונך למחוק %ld קבצים ו %ld תיקיות אלו?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, fuzzy, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "ברצונך למחוק %ld קבצים ו %ld תיקיות אלו?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "מחק"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "יציאה"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2054,592 +2034,579 @@ msgstr ""
 "ישנן העברות בפעולה \n"
 "האם אתה בטוח שברצונך לצאת ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 #, fuzzy
 msgid "Open Location"
 msgstr "אפשרויות"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "הזן כתובת איטרנט"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_קובץ"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 #, fuzzy
 msgid "/FTP/Window _1"
 msgstr "/_קובץ/חלון 1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 #, fuzzy
 msgid "/FTP/Window _2"
 msgstr "/_קובץ/חלון 2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 #, fuzzy
 msgid "/FTP/_Ascii"
 msgstr "/קובץ/יציאה"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 #, fuzzy
 msgid "/FTP/_Binary"
 msgstr "/קובץ/יציאה"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 #, fuzzy
 msgid "/FTP/_Preferences..."
 msgstr "/קובץ/מאפיינים"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/קובץ/יציאה"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_מקומי"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 #, fuzzy
 msgid "/Local/_Open Location..."
 msgstr "/מקומי/התחבר לכתובת איטרנט"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 #, fuzzy
 msgid "/Local/D_isconnect"
 msgstr "/מקומי/התנתק"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 #, fuzzy
 msgid "/Local/Change _Filespec..."
 msgstr "שנה קובץ ספציפי"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 #, fuzzy
 msgid "/Local/_Show selected"
 msgstr "/מקומי/הצג מסומנים"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 #, fuzzy
 msgid "/Local/Select _All"
 msgstr "/מקומי//סמן הכל"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/מקומי/סמן כל הקבצים"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/מקומי/בטל הכל"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/מקומי/שמור רשימת תיקיה"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/מקומי/שלח פקודת SITE"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 #, fuzzy
 msgid "/Local/_Change Directory"
 msgstr "/מקומי/שנה תיקיה"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 #, fuzzy
 msgid "/Local/_Permissions..."
 msgstr "/מקומי/שנה הרשאות"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 #, fuzzy
 msgid "/Local/_New Folder..."
 msgstr "/קובץ/תיקיה חדשה"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 #, fuzzy
 msgid "/Local/Rena_me..."
 msgstr "/מקומי/שנה שם"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 #, fuzzy
 msgid "/Local/_Delete..."
 msgstr "/מקומי/מחק"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 #, fuzzy
 msgid "/Local/_Edit..."
 msgstr "/מקומי/ערוך"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 #, fuzzy
 msgid "/Local/_View..."
 msgstr "/מקומי/הצג"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 #, fuzzy
 msgid "/Local/_Refresh"
 msgstr "/מקומי/רענן"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_מרוחק"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 #, fuzzy
 msgid "/Remote/_Open Location..."
 msgstr "/מרוחק/התחבר לכתובת איטרנט"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 #, fuzzy
 msgid "/Remote/D_isconnect"
 msgstr "/מרוחק/התנתק"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 #, fuzzy
 msgid "/Remote/Change _Filespec..."
 msgstr "שנה קובץ ספציפי"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
 msgid "/Remote/_Show selected"
 msgstr "/מרוחק/הצג מסומנים"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 #, fuzzy
 msgid "/Remote/Select _All"
 msgstr "/מרוחק/סמן הכל"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/מרוחק/סמן כל הקבצים"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/מרוחק/בטל הכל"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/מרוחק/שמור רשימת תיקייה"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/מרוחק/שלח פקודת SITE"
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 #, fuzzy
 msgid "/Remote/_Change Directory"
 msgstr "/מרוחק/שנה תיקייה"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 #, fuzzy
 msgid "/Remote/_Permisssions..."
 msgstr "/מרוחק/שנה הרשאות"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 #, fuzzy
 msgid "/Remote/_New Folder..."
 msgstr "/קובץ/תיקיה חדשה"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 #, fuzzy
 msgid "/Remote/Rena_me..."
 msgstr "/מרוחק/שנה שם"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 #, fuzzy
 msgid "/Remote/_Delete..."
 msgstr "/מרוחק/מחק"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 #, fuzzy
 msgid "/Remote/_Edit..."
 msgstr "/מרוחק/ערוך"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 #, fuzzy
 msgid "/Remote/_View..."
 msgstr "/מרוחק/הצג"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 #, fuzzy
 msgid "/Remote/_Refresh"
 msgstr "/מרוחק/רענן"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_מועדפים"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/מועדפים/הוסף מועדף"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/מועדפים/ערוך מועדף"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 #, fuzzy
 msgid "/_Transfer"
 msgstr "/_שיתוף"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 #, fuzzy
 msgid "/Transfer/tearoff"
 msgstr "/שיתוף/התחל שיתוף"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
 msgid "/Transfer/_Start"
 msgstr "/שיתוף/התחל שיתוף"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 #, fuzzy
 msgid "/Transfer/St_op"
 msgstr "/שיתוף/הפסק שיתוף"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
 msgid "/Transfer/sep"
 msgstr "/_שיתוף"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
 msgid "/Transfer/Skip _Current File"
 msgstr "/שיתוף/דלג על קובץ זה"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
 msgid "/Transfer/_Remove File"
 msgstr "/שיתוף/מחק"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
 msgid "/Transfer/Move File _Up"
 msgstr "/שיתוף/העלה למעלה"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
 msgid "/Transfer/Move File _Down"
 msgstr "/שיתוף/הורד למטה"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 #, fuzzy
 msgid "/Transfer/_Retrieve Files"
 msgstr "/שיתוף/מחק"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 #, fuzzy
 msgid "/Transfer/_Put Files"
 msgstr "/שיתוף/מחק"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 #, fuzzy
 msgid "/L_og"
 msgstr "/_לוגים"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 #, fuzzy
 msgid "/Log/tearoff"
 msgstr "/לוגים/נקה"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 #, fuzzy
 msgid "/Log/_Clear"
 msgstr "/לוגים/נקה"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
 msgid "/Log/_View"
 msgstr "/מקומי/הצג"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
 msgid "/Log/_Save..."
 msgstr "/לוגים/שמור לוג.."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_כלים"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 #, fuzzy
 msgid "/Tools/C_ompare Windows"
 msgstr "/כלים/השווה חלונות"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 #, fuzzy
 msgid "/Tools/_Clear Cache"
 msgstr "/כלים/נקה מטמון"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/עזרה"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 #, fuzzy
 msgid "/Help/_About"
 msgstr "/עזרה/אודות"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "שרת:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 #, fuzzy
 msgid "_Host: "
 msgstr "שרת:"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "פורט:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "שם משתמש:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 #, fuzzy
 msgid "_User: "
 msgstr "שם משתמש:"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "סיסמה:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "פקודה: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "שם קובץ"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "גודל"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "פעולה:"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "רענן"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "שם משתמש"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "אנא הכנס שם משתמש :"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "אנא הכנס סיסמה"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "צור תיקיה"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "שם התיקיה החדשה :"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "שנה שם"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "אתה בטוח שברצונך לשנות את %s ל ? :"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "SITE"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "פקודת SITE ספציפית :"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr ""
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "כתוב על"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "המשך"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "דלג"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "פעולה"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr ""
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr "נוצרה התנגשות בין קבצים, מה ברצונך לעשות?"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr ""
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "דלג על קובץ זה"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "בטל הכל"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "שמור לוג"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "אודות gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -2651,329 +2618,314 @@ msgstr ""
 "כתובתנו באיטרנט : http://www.gftp.org/\n";
 "לוגו ע\"י : אהרון וורלי <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "אודות"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "רשיון"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  סגור  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "לא מחובר"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "שנה"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "הוסף"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ביטול"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "כן"
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "לא"
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "עצור"
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ערוך שרת"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "הוסף שרת"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr ""
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "שם-מתחם (דומיין)"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr ""
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "מסכת רשת"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 #, fuzzy
 msgid "N_etmask:"
 msgstr "מסכת רשת"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 #, fuzzy
 msgid "_Domain:"
 msgstr "שם-מתחם (דומיין)"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "מסכת רשת"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "שרתים מקומיים"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "ערוך"
-
-#: ../src/gtk/options_dialog.c:1290
-#, fuzzy
-msgid "_Edit"
-msgstr "ערוך"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "החל"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr ""
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ערוך קובץ"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "סיים פעולה"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: ../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
+#: 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 ""
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "הצג"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "ערוך"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr ""
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
+#~ msgid "  Cancel  "
+#~ msgstr "ביטול"
+
+#~ msgid "Host: "
+#~ msgstr "שרת:"
 
+#~ msgid "User: "
+#~ msgstr "שם משתמש:"
 
+#~ msgid "  Close  "
+#~ msgstr "  סגור  "
 
+#~ msgid "Add"
+#~ msgstr "הוסף"
 
+#~ msgid "Cancel"
+#~ msgstr "ביטול"
 
+#~ msgid "  Yes  "
+#~ msgstr "כן"
 
+#~ msgid "  No  "
+#~ msgstr "לא"
+
+#, fuzzy
+#~ msgid "_Edit"
+#~ msgstr "ערוך"
 
+#~ msgid "Apply"
+#~ msgstr "החל"
diff --git a/po/hi.po b/po/hi.po
index 084cc10..8835179 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,16 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-08-14 16:21+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-08-19 10:54+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672 gmail com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
+"Language: hi\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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -23,86 +25,86 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "अवैध URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "त्रुटि: कैश सूची फ़ाइल में अवैध पंक्ति %s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "'%s' स्ट्रिंग को वर्ण सेट %s से वर्ण सेट %s में बदलने में त्रुटि: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "त्रुटि: स्थानीय फ़ाइल %s को खोल नहीं सकता है: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "त्रुटि: सॉकेट में लिख नहीं सका: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "त्रुटि: सॉकेट से पढ़ नहीं सका: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "चेतावनी: प्रधान पुस्तचिह्न फ़ाइल %s नहीं ढूँढ सकता है\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP चेतावनी: पुस्तचिह्न फ़ाइल %d में छोड़ रहा है: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP चेतावनी: पंक्ति %d के पास पर्याप्त तर्क नहीं है\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -112,7 +114,7 @@ msgstr ""
 "जरूरत नहीं है (यदि उपलब्ध है). वाक्य रचना: dont_use_proxy=.domain या "
 "dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -120,52 +122,52 @@ msgstr ""
 "ext=file extenstion:XPM फाइल:एस्की या द्विपदीय (A या B):दर्शक प्रोग्राम. नोट: "
 "फ़ाइल विस्तार के अलावे सभी तर्क वैकल्पिक हैं"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "क्या आप संस्थापना बनाना चाहते हैं?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP त्रुटि: खराब लॉग फ़ाइल नाम %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -173,224 +175,226 @@ msgstr ""
 "gFTP के लिए पुस्तचिह्न फ़ाइल. Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. चेतावनी: कोई टिप्पणी जो आप इस फ़ाइल में जोड़ते हैं को अधिलिखित किया जाएगा"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
-msgstr "नोट: इस फ़ाइल में समाहित कूटशब्द बेतरतीब हैं. यह अलगोरिथम सुरक्षित नहीं है. यह आपके कूटशब्द के आसानी 
से याद किए जाने से रोकने से बचने लिए है जब आप इस फ़ाइल को समाप्त कर रहे हैं. इसके पहले, सभी कूटशब्द सादे पाठ 
में जमा किया गया था."
+msgstr ""
+"नोट: इस फ़ाइल में समाहित कूटशब्द बेतरतीब हैं. यह अलगोरिथम सुरक्षित नहीं है. यह आपके कूटशब्द "
+"के आसानी से याद किए जाने से रोकने से बचने लिए है जब आप इस फ़ाइल को समाप्त कर रहे हैं. इसके "
+"पहले, सभी कूटशब्द सादे पाठ में जमा किया गया था."
 
-#: ../lib/config_file.c:845
+#: 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 के अंदर बदल नहीं सकते हैं."
+"org>. चेतावनी: कोई टिप्पणी जो आप इस फ़ाइल में जोड़ते हैं को अधिलिखित किया जाएगा. यदि "
+"किसी प्रविष्टि में (*) है इसकी टिप्पणी में, आप इसे gFTP के अंदर बदल नहीं सकते हैं."
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<अज्ञात>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "त्रुटि: %s फ़ाइल अपलोड नहीं कर सकता है\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "त्रुटि: %s फ़ाइल में लिख नहीं सकता है: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "त्रुटि: फ़ाइल बंद करने में त्रुटि: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP सर्वर %s से खराब फ़ाइल सूची\n"
 
-#: ../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
+#: 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 "अज्ञात"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP निर्देशिका सूची %s नहीं पा सका: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "निर्देशिका को सफलतापूर्वक %s में बदला\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "निर्देशिका %s में बदल नहीं सका\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "सफलतापूर्वक हटाया %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "त्रुटि: फ़ाइल %s को नहीं हटा सका: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "FTPS समर्थन अनुपलब्ध है क्योंकि SSL समर्थन कंपाइल नहीं किया गया था. कनेक्शन समाप्त कर रहा है.\n"
+msgstr ""
+"FTPS समर्थन अनुपलब्ध है क्योंकि SSL समर्थन कंपाइल नहीं किया गया था. कनेक्शन समाप्त कर "
+"रहा है.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "HTTPS समर्थन अनुपलब्ध जबसे SSL समर्थन कंपाइल नहीं था. कनेक्शन रोक रहा है.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "मौजूदा कार्यशील निर्देशिका को नहीं पा सका: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "स्थानीय निर्देशिका को %s में सफलतापूर्वक बदला\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "स्थानीय निर्देशिका को %s में बदल नहीं सका: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "त्रुटि: स्थानीय फ़ाइल %s को काट नहीं सकता है: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "स्थानीय निर्देशिका सूची %s को नहीं पा सका: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s का %o में मोड सफलतापूर्वक बदला\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "त्रुटि: %s का %o में मोड बदल नहीं सका: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s का टाइम स्टैंप सफलतापूर्वक बदला\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "त्रुटि: %s का टाइमस्टैंप नहीं बदला सका: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "लोकल फ़ाइलसिस्टम"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "प्रयोग: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "कुछ नहीं"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "फ़ाइल"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "आकार"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "उपयोक्ता"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "समूह"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "तिथिसमय"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "गुण"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "अवरोही"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "आरोही"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "सामान्य"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "प्रोग्राम देखें:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -398,27 +402,27 @@ msgstr ""
 "तयशुदा प्रोग्राम को फ़ाइलों को देखने के लिए प्रयोग किया जाता है. यदि यह खाली है, आंतरिक "
 "फ़ाइल दर्शक का प्रयोग किया जायेगा"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "प्रोग्राम संपादित करें:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "तयशुदा प्रोग्राम जो फ़ाइल संपादित करने के लिए प्रयोग की जाती है."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "अधिकतम लॉग विंडो साइज:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ port के लिए बाइट में लॉग विंडो का अधिकतम आकार"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "दूरस्थ वर्ण सेट:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -426,188 +430,199 @@ msgstr ""
 "यह कोमा से अलग की गई वर्णसमूह सूची है जो दूरस्थ संदेश को मौजूदा लोकेल में बदलने की कोशिश "
 "करता है"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "दूरस्थ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 का मान है. यह इसलिए कि दिनांक को निर्देशिका सूची में उचित तरीके से 
विश्लेषित किया जा सकता है."
+msgstr ""
+"यह दूरस्थ साइट के लिए LC_TIME का मान है. यह इसलिए कि दिनांक को निर्देशिका सूची में "
+"उचित तरीके से विश्लेषित किया जा सकता है."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "कैश TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "सेकेंड की संख्या कैश प्रविष्टि को उनके समय समाप्त हो जाने के पहले रखने के रखने के लिए."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "फ़ाइल हस्तांतरण जोड़ें"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "मौजूदा में नया फ़ाइल हस्तांतरण जोड़ें"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "एक समय में एक हस्तांतरित करें"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "किसी एक समय पर एक हस्तांतरित करें?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "तयशुदा रूप से अधिलिखित करें"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "तयशुदा रूप से फ़ाइल को अधिलिखित करें या फ़ाइल हस्तांतरण वापसी के लिए सेट करें"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "फ़ाइल अनुमति बनाये रखें"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "हस्तांतरित फ़ाइलों की फ़ाइल अनुमति बनाए रखें"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "फ़ाइल टाइम संरक्षित रखें"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "हस्तांतरित फ़ाइलों का फ़ाइल समय सुरक्षित रखें"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "हर फ़ाइल हस्तांतर के बाद ताज़ा करें"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "हर बार फ़ाइल हस्तांतरित होने पर सूचीबॉक्स को ताज़ा करें"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "निर्देशिका पहले छांटें"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "तब फ़ाइलों को निर्देशिका पहले रखें"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "छुपी फ़ाइलें दिखाएँ"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "सूचीबॉक्स में छुपी फाइलें दिखाएँ"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "शीर्षक में हस्तांतरण स्थिति दिखाएँ"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "शीर्षकपट्टी में फ़ाइल हस्तांतरण स्थिति दिखाएँ"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "फ़ाइल हस्तांतरण आरंभ करें"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "फ़ाइल हस्तांतरण को स्वतः आरंभ करें जब वे कतारबद्ध होते हैं"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI में दस्ती कमांड की अनुमति दें"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI (functions like the text port) में दस्ती कमांड दाखिल करने की अनुमति दें"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "अंतिम निर्देशिका याद करें"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "अंतिम स्थानीय और दूरस्थ निर्देशिका सहेजें जब अनुप्रयोग बंद है"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "आरंभ में दूरस्थ सर्वर कनेक्ट करें"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "दूरस्थ सर्वर से स्वतः कनेक्ट करें जब अनुप्रयोग आरंभ होता है."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "संजाल"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "संजाल समय समाप्ति:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "संजाल इनपुट/आउटपुट के लिए समय समाप्ति प्रतीक्षा. यह एक निष्क्रिय समय समाप्ति नहीं है."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"संजाल इनपुट/आउटपुट के लिए समय समाप्ति प्रतीक्षा. यह एक निष्क्रिय समय समाप्ति नहीं है."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "कनेक्ट करने की फिर कोशिश:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "फिर कोशिश करने की संख्या. इसे 0 पर सेट करें अनंत काल तक इसे फिर कोशिश करने के लिए"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "स्लीप टाइम की फिर कोशिश करें:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "फिर कोशिश करने में सेकेंड के प्रतीक्षा"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "अधिकतम KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "एक फ़ाइल हस्तांतरण KB/s की फ़ाइल पा सकता है. (0 पर निष्क्रिय करने के लिए सेट करें)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "खंड आकार हस्तांतरित करें:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr "खंड आकार जो कि फ़ाइल हस्तांतरण के दौरान प्रयुक्त होता है. इसे 1024 का गुणक होना चाहिए."
+msgstr ""
+"खंड आकार जो कि फ़ाइल हस्तांतरण के दौरान प्रयुक्त होता है. इसे 1024 का गुणक होना चाहिए."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "तयशुदा प्रोटोकॉल:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "यह प्रयोग के लिए तयशुदा प्रोटोकॉल का प्रयोग करता है"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 समर्थन सक्रिय करें"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -615,27 +630,27 @@ msgstr ""
 "यह परिभाषित करता है कि क्या होगा जब आप फ़ाइल लिस्टबॉक्स पर डबल क्लिक करते हैं. 0=फ़ाइल "
 "देखें 1=फ़ाइल संपादित करें 2=फ़ाइल हस्तांतरित करें"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "दूरस्थ फ़ाइल सूचीबॉक्स का तयशुदा चौड़ाई"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "दूरस्थ फ़ाइल सूचीबॉक्स की तयशुदा चौड़ाई"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "स्थानीय/दूरस्थ फ़ाइल सूचीबॉक्स की तयशुदा ऊंचाई"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "हस्तांतरण सूचीबॉक्स की तयशुदा ऊंचाई"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "लॉगिंग विंडो की तयशुदा ऊंचाई"
 
-#: ../lib/options.h:177
+#: 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."
@@ -643,15 +658,15 @@ msgstr ""
 "हस्तांतरण विंडो में फ़ाइल नाम कॉलम की चौड़ाई. इसे 0 पर सेट करें इस कॉलम को स्वतः फिर "
 "आकार देने के लिए."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "इसके द्वारा तयशुदा कॉलम छांटा जाता है"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "आरोही या अवरोही में छांटें"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -659,7 +674,7 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में फ़ाइल नाम कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर "
 "आकार देने के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -667,7 +682,7 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में आकार कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर आकार "
 "देने के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -675,7 +690,7 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में उपयोक्ता कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर "
 "आकार देने के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -683,7 +698,7 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में समूह कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर आकार देने "
 "के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -691,7 +706,7 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में तिथि कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर आकार "
 "देने के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -699,183 +714,185 @@ msgstr ""
 "फ़ाइल सूचीबॉक्स में गुण कॉलम की चौड़ाई.  इसे 0 पर सेट करें इस कॉलम को स्वतः फिर आकार देने "
 "के लिए. इसे -1 पर सेट करें इस कॉलम को निष्क्रिय करने के लिए"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "कमांड रंग जो कि सर्वर को भेजा जाता है"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "कमांड रंग जो कि सर्वर से प्राप्त किया जाता है"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "त्रुटि संदेश का रंग"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "शेष लॉग संदेश का रंग"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "स्थानीय"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "पुस्तचिह्न"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "फ़ाइल हस्तांतऱण %.2f KB/s से किया जायेगा\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME को '%s' में सेट करने में त्रुटि. '%s' में वापस\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "निर्देशिका सूची %s को कैश से लोड कर रहा है (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "निर्देशिका सूची %s को सर्वर से लोड कर रहा है (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "चेतावनी: फ़ाइल '%s' का पथ काट रहा है. काटा हुआ पथ (%s) मौजूदा निर्देशिका (%s) से मेल नहीं खाता\n"
+msgstr ""
+"चेतावनी: फ़ाइल '%s' का पथ काट रहा है. काटा हुआ पथ (%s) मौजूदा निर्देशिका (%s) से मेल "
+"नहीं खाता\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "त्रुटि: कैश को लिख नहीं सकता है: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "त्रुटि: पुस्तचिह्न %s नहीं पा सका\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "पुस्तचिह्न त्रुटि: पुस्तचिह्न प्रविष्टि %s के पास एक मेजबान नाम नहीं है\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "प्रोटोकॉल '%s' अभी समर्थित नहीं है.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "पुनरावृत सांकेतिक कड़ी %s पाया\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "त्रुटि: दूरस्थ साइट %s डिसकनेक्टेड. कोशिश की अधिकतम सीमा तक...छोड़ रहा है\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "प्रधान pty %s खोल नहीं सकता: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "सॉकेट जोड़ा नहीं बना सकता है: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "त्रुटि: ssh चला नहीं सकता है: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "दूसरी प्रक्रिया बांट नहीं सकता है: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "प्रॉक्सी मेजबाननाम:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "फाय़रवाल मेजबाननाम"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "प्रॉक्सी पोर्ट:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "फायरवॉल पर जोड़ने के लिए पोर्ट"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "प्रॉक्सी प्रयोक्तानाम:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "आपका फ़ायरवाल प्रयोक्तानाम"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "प्रॉक्सी कूटशब्द:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "आपका फ़ायरवाल कूटशब्द"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 का प्रयोग करें"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -884,65 +901,65 @@ msgstr ""
 "सर्वर से गलत अनुक्रिया पाया, छोड़ रहा है\n"
 "अवैध चंक आकार '%s' दूरस्थ सर्वर के द्वारा वापस\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ऑफ़सेट पर फ़ाइल हस्तांतरण आरंभ कर रहा है"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s फ़ाइल नहीं पा सकता है\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "निर्देशिका सूची प्राप्त कर रहा है...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "सर्वर से गलत अनुक्रिया पाया, छोड़ रहा है\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE कमांड"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP प्रॉक्सी"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "मनपसंद"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ई-मेल पताः"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -950,19 +967,19 @@ msgstr ""
 "यह कूटशब्द है जिसे प्रयोग किया जायेगा जब कभी आप रिमोट FTP सर्वर में अनाम रूप से लॉग करते "
 "हैं"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "प्रॉक्सी खाता:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "आपका फ़ायरवाल खाता (वैकल्पिक)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "प्रॉक्सी सर्वर प्रकार:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -978,25 +995,26 @@ msgstr ""
 "दूसरा वर्ण u (user), p (pass), h (host), o (port) या a (account) हो सकता है. "
 "उदाहरण के लिए, प्रॉक्सी उपयोक्ता को निर्दिष्ट करने के लिए, आप %pu में टाइप कर सकते हैं."
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV पता अनदेखा करें"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"यह यदि सक्रिय है, तब दूरस्थ FTP सर्वर का PASV IP पता क्षेत्र को अनदेखा किया जाएगा और मेजबान के IP पता को 
बदले में प्रयोग किया जाएगा. यह प्रायः रॉटर के लिए जरूरी होता है जो इसके बाहरी IP पता के बजाए आंतरिक "
-"पता को PASV उत्तर में देता है."
+"यह यदि सक्रिय है, तब दूरस्थ FTP सर्वर का PASV IP पता क्षेत्र को अनदेखा किया जाएगा और "
+"मेजबान के IP पता को बदले में प्रयोग किया जाएगा. यह प्रायः रॉटर के लिए जरूरी होता है जो "
+"इसके बाहरी IP पता के बजाए आंतरिक पता को PASV उत्तर में देता है."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "निष्क्रिय फ़ाइल हस्तांतरण"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1011,11 +1029,11 @@ msgstr ""
 "करता है. यदि यह निष्क्रिय है, तब gFTP क्लाइंट साइड पर एक पोर्ट खोलेगा और रिमोट सर्वर "
 "इससे कनेक्ट करने की कोशिश करेगा."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "दूरस्थ सिमलिंक (LIST -L) हल करें"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1026,15 +1044,16 @@ msgstr ""
 "सक्रिय रखना बढिया बात है. सिर्फ एक बार आप इसे निष्क्रिय करना चाहेंगे यदि रिमोट FTP "
 "सर्वर सूची में L विकल्प का समर्थन नहीं करता है."
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "फ़ाइल ASCII मोड में हस्तांतरित करें"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1043,330 +1062,323 @@ msgstr ""
 "आप युनिक्स से युनिक्स में हस्तांतरित कर रहा है, तब इसे छोड़ देना सुरक्षित है. यदि आप द्विपदीय "
 "आंकड़ा डाउनलोज कर रहे हैं, आपको इसे निष्क्रिय करना होगा."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "IP पता को PASV अनुक्रिया '%s' में पा नहीं सका\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
-msgstr "IP पता को PASV अनुक्रिया में अनदेखा कर रहा है, इससे कनेक्ट कर रहा है %d.%d.%d.%d:%d\n"
+msgstr ""
+"IP पता को PASV अनुक्रिया में अनदेखा कर रहा है, इससे कनेक्ट कर रहा है %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "डाटा कनेक्शन नहीं बना सकता है: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "पोर्ट नहीं बाइंड कर सकता है: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "कोई IPv6 सॉकेट बनाने में विफल: %s\n"
 
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "अवैध EPSV अनुक्रिया '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "स्थानीय सॉकेट का पता नहीं पा सकता है: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "सर्वर से कनेक्शन नहीं स्वीकार कर सकता है: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "कुल"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "सॉकेट फ्लैग नहीं पा सकता है: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "सॉकेट को गैर ब्लॉकिंग में सेट नहीं कर सकता है: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH प्रोग्राम नाम:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH एक्सक्यूटेबल का पथ"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH अतिरिक्त परम:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH प्रोग्राम में भेजने के लिए अतिरिक्त पैरामीटर"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH उपयोक्ता/कूटशब्द जरूरी"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH कनेक्शन के लिए उपयोक्ता/कूटशब्द जरूरी"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "प्रोग्राम %s चला रहा है\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA कुंजी के लिए कूटशब्द दाखिल करें"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "कुंजी ' के लिए कूटशब्द दाखिल करें"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "कूटशब्द"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "शब्दकूट"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "कूटशब्द दर्ज करें:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "कूटशब्द दाखिल करें"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID कूटशब्द दाखिल करें:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "त्रुटि: एक गलत कूटशब्द दाखिल किया गया था\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: प्रोटोकॉल आरंभीकरण\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: प्रोटोकॉल संस्करण %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s खोलें\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: बंद करें\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: निर्देशिका %s खोलें\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: निर्देशिका पढ़ें\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: फ़ाइल %s हटाएं\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: निर्देशिका %s बनाएं\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: निर्देशिका %s हटाएं\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: वास्तविकपथ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: फ़ाइल गुण\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ठीक"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "ऐसी कोई फ़ाइल या निर्देशिका नहीं"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "अनुमति निषेधित"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "विफलता"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "खराब संदेश"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "कोई कनेक्शन नहीं"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "कनेक्शन नष्ट हुआ"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "ऑपरेशन असमर्थित"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "सर्वर से अज्ञात संदेश वापस"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "त्रुटि: संदेश आकार %d बहुत बड़ा है\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1374,41 +1386,41 @@ msgstr ""
 "SSH कनेक्शन को आरंभ करने में त्रुटि थी रिमोट सर्वर के साथ. रिमोट सर्वर से त्रुटि संदेश आता "
 "है:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH कनेक्शन को %s मे खोलना\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH सर्वर %s में सफलतापूर्वक लॉग किया\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL इंजन"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL एंट्रोपी फ़ाइल:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL एंट्रोपी फ़ाइल"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "एंट्रोपी सीड लंबाई:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL इंजन को इसके साथ सीड करने के लिए अधिकतम संख्या में बाइट"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL पीयर जांचें"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1421,11 +1433,11 @@ msgstr ""
 "विषय = %s\n"
 "त्रुटि %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "पीयर सर्टिफिकेट नहीं पा सकता है\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1434,45 +1446,45 @@ msgstr ""
 "त्रुटि: SSL प्रमाणपत्र (%s) में होस्ट उस होस्ट से मेल नहीं खाता है जिससे हम (%s) कनेक्टेड हैं. "
 "कनेक्शन रोक रहा है.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL लाइब्रेरी आरंभीकृत नहीं कर सकता है\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "तयशुदा SSL प्रमाणपत्र लोड करने में त्रुटि\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "साइफर सूची सेट करने में त्रुटि (कोई वैध साइफर नहीं)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "त्रुटि: SSL इंजन आरंभीकृत नहीं था\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL कनेक्शन त्रुटि सेट करने में त्रुटि (BIO प्रोजेक्ट)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL कनेक्शन त्रुटि सेट करने में त्रुटि (SSL वस्तु)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "पीयर सर्टिफिकेट के साथ त्रुटि: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "ऑपरेशन रद्द\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "%d सेकेंड तक प्रतीक्षा जबतक कि फिर कनेक्ट करने की कोशिश न करें\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1482,73 +1494,73 @@ msgstr ""
 "फ्री साफ्टवेयर है और आप इसे खास स्थितियों के अंतर्गत  पुनर्वितरित करने के लिए आमंत्रित हैं; "
 "विवरण के लिए, कॉपी करने वाली फ़ाइल देखें\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "अनुवादक"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "प्रयोग: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "प्रयोग: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "प्रयोग: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "प्रयोग: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "प्रयोग: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "प्रयोग: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "प्रयोग: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "अवैध तर्क\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "निर्देशिका कैश साफ करें\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "प्रयोग: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "प्रयोग: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "त्रुटि: चर %s एक वैध विन्यास चर नहीं है.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1556,319 +1568,321 @@ msgstr ""
 "समर्थित कमांड:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "प्रयोग: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "परिचय"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP सूचना दिखाता है"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "मौजूदा फ़ाइल हस्तांतरण मोड को Ascii में सेट करें (सिर्फ FTP के लिए)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "द्विपदीय"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "मौजूदा फ़ाइल हस्तांतरण मोड को द्विपदीय में सेट करें (सिर्फ FTP के लिए)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "रिमोट कार्यशील निर्देशिका बदलता है"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "रिमोट फ़ाइल की अनुमति बदलता है"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "साफ करें"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "उपलब्ध विकल्प: कैश"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "बंद करें"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "रिमोट साइट से डिसकनेक्ट करें"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "मिटाएं"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "रिमोट फ़ाइल को हटाता है"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "निर्देशिका"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "मौजूदा रिमोट निर्देशिका के लिए निर्देशिका सूची दिखाता है"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "पाएँ"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "दूरस्थ फ़ाइल डाउनलोड करता है"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "मदद"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "इस मदद स्क्रीन को दिखाता है"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "स्थानीय कार्यशील निर्देशिका को बदलता है"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "स्थानीय फ़ाइल की अनुमति को बदलता है"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "स्थानीय फ़ाइल को हटाता है"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "मौजूदा लोकल निर्देशिका में निर्देशिका सूचन दिखाएं"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "स्थानीय निर्देशिका बनाता है"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "मौजूदा स्थानीय निर्देशिका दिखाता है"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "लोकल फ़ाइल का फिर नाम देता है"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "स्थानीय निर्देशिका को हटाता है"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "दूरस्थ निर्देशिका बनाता है"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "लोकल फ़ाइल अपलोड करता है"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "खोलें"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "दूरस्थ साइट में एक कनेक्शन खोलता है"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "रखें"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "मौजूदा दूरस्थ निर्देशिका दिखाता है"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "बाहर"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP से बाहर"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "फिर नाम दें"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "दूरस्थ फ़ाइल का नाम फिर दें"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "दूरस्थ निर्देशिका हटाएं"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "सेट"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr "विन्यास फ़ाइल चरों को दिखाएं. आप set var=val से चर को सेट कर सकते हैं"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "साइट"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "कोई साइट विशेष कमांड चलाएं"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "त्रुटि: कमांड अपरिचित\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s फ़ाइल %s मेजबान पर छोड़ रहा है\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s मेजबान पर हस्तांतरण रोक रहा है\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s को %s से डाउनलोड नहीं कर सका\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
-msgstr "%d फ़ाइल या निर्देशिकाएं थी जो कि हस्तांतरित नहीं हो सकती हैं. लॉग जांचें जिसके लिए मद उचित रूप से 
हस्तांतरित नहीं की गई थी."
+msgstr ""
+"%d फ़ाइल या निर्देशिकाएं थी जो कि हस्तांतरित नहीं हो सकती हैं. लॉग जांचें जिसके लिए मद "
+"उचित रूप से हस्तांतरित नहीं की गई थी."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: रोकने के बटन को सबसे पहले हिट करें कोई चीज करने के पहले\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "पुस्तचिह्न चलाएं"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "पुस्तचिह्न जोड़ें: पुस्तचिह्न के लिए आप अपना नाम जरूर जोड़ें\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "पुस्तचिह्न जोड़ें: पुस्तचिह्न %s जोड़ नहीं सका क्योंकि वह नाम पहले से मौजूद है\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr " पसंदीदा  जोड़ें"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "पुस्तक चिह्न जोड़ें: आप एक मेजबाननाम जरूर दें\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1878,31 +1892,31 @@ msgstr ""
 "आप / के द्वारा मदों को अलग कर सकते हैं उपमेनू इसमें रखने के लिए\n"
 "(उदा: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "कूटशब्द याद रखें"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "आप इस पुस्तचिह्न के लिए कोई नाम जरूर निर्दिष्ट करें."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "नया फ़ोल्डर"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "बनाने के लिए नये फोल्डर का नाम दें"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "नई वस्तु"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "नये मदों का नाम बनाने के लिए दीजिए"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1911,106 +1925,99 @@ msgstr ""
 "क्या आप इन पुस्तचिह्न\n"
 "%s और इसकी सभी संतति को मिटाने के लिए निश्चित हैं?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "पुस्तचिह्न मिटाएँ"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "पुस्तचिह्न"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "प्रविष्टि संपादित करें"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "विवरण:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "मेजबाननाम:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "पोर्टः"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "प्रोटोकॉल:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "दूरस्थ निर्देशिका:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "स्थानीय निर्देशिका:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "उपयोक्ता नाम:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "कूटशब्द: "
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "खाता:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "अज्ञात रूप में लॉगिन हों"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  रद्द करें  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/File/New _Folder..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/New _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/File/_Delete"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/File/_Properties..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Close"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "पुस्तचिह्न संपादित करें"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2018,91 +2025,90 @@ msgstr ""
 "आप अब अपनी फ़ाइलों के गुणों को समायोजित कर सकते हैं\n"
 "नोट: सभी ftp सर्वर chmod फीचर का समर्थन नहीं करता है"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "विशेष"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "स्टिकी"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "उपयोक्ता"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "पढ़ें"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "लिखें"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "चलाएँ"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "समूह"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "अन्य"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "क्या आप %ld फ़ाइलों व %ld निर्देशिका को मिटाने के लिए सुनिश्चित हैं"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "क्या आप इन फ़ाइलों %ld को मिटाने के लिए निश्चित हैं"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "क्या आप इन निर्देशिकाओं %ld को मिटाने के लिए निश्चित हैं"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "फ़ाइल/निर्देशिका मिटाएँ"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "मिटाएँ"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "कनेक्ट"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s प्राप्त\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "खीचें व छोड़ें"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "निकास"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2110,468 +2116,455 @@ msgstr ""
 "फ़ाइल हस्तांतरण प्रगति में है.\n"
 "क्या आप निश्चित निकलना चाहते हैं?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "स्थान खोलें"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "कोई URL दर्ज करें जिसमें कनेक्ट होना है"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Window _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Window _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binary"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferences..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Quit"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_View..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remote"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remote/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remote/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remote/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remote/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remote/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remote/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remote/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remote/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remote/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remote/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remote/_Permisssions..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remote/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remote/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remote/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remote/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remote/_View..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remote/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bookmarks/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bookmarks/Add _Bookmark"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bookmarks/Edit Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bookmarks/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transfer"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transfer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transfer/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transfer/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transfer/Skip _Current File"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transfer/_Remove File"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transfer/Move File _Up"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transfer/Move File _Down"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfer/_Retrieve Files"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transfer/_Put Files"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Clear"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_View"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Save..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Tool_s"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tools/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/C_ompare Windows"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Tools/_Clear Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Help"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "मेजबान: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "मेजबान (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "पोर्ट: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "उपयोक्ता:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "उपयोक्ता (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "कूटशब्द: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "कमांड: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "फ़ाइलनाम"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "आकार"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "दिनांक"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "गुण"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "प्रगति"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "त्रुटि: आप जरूर मेजबान टाइप करें जिसमें कनेक्ट होना है\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ताज़ा करें"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "उपयोक्तानाम दाखिल करें"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "इस साइट के लिए अपना उपयोक्तानाम जरूर दर्ज करें"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "कृपया इस साइट के लिए अपना कूटशब्द दाखिल करें"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "संक्रिया रद्द...आप जरूर कोई स्ट्रिंग दर्ज करें\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "निर्देशिका बनाएँ"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "बनाने के लिए निर्देशिका का नाम दें"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "नाम बदलें"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "आप %s को किस नाम में बदलना चाहेंगे?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "साइट"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "साइट विशेष कमांड दाखिल करें"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE में पहले जोड़ें"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "मिटाकर लिखें"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "पुनरारंभ"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "छोड़ें"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "क्रिया"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "फ़ाइल हस्तांतरित कर रहा है"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2579,70 +2572,71 @@ msgstr ""
 "निम्न फ़ाइल लोकल व दूरस्थ कंप्यूटर दोनों पर है\n"
 "कृपया चुनें कि आप क्या करना चाहेंगे"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "त्रुटि"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "फ़ाइल छोड़ें"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "सभी चुनें"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "सभी अचयनित करें"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec बदलें: ऑपरेशन रद्द...आपको जरूर एक स्ट्रिंग देना चाहिए\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec बदलें"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "त्रुटि: %s को लिखने के लिए नहीं खोल सकता है: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "निर्देशिका सूची सहेजें"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "त्रुटि: %s में लिखने में त्रुटि: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s में सफलतापूर्वक लॉग फ़ाइल लिखा\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "लॉग सहेजें"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "कॉपी करने के लिये लाइसेंस अनुबंध पा नहीं सकता है. सुनिश्चित करें कि यह या तो %s या %s में है"
+msgstr ""
+"कॉपी करने के लिये लाइसेंस अनुबंध पा नहीं सकता है. सुनिश्चित करें कि यह या तो %s या %s में है"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP परिचय"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2653,100 +2647,80 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "परिचय"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "लाइसेंस मसौदा"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  बंद करें  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "विंडोज तुलना करें"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "दूरस्थ सर्वर से डिसकनेक्ट"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
-"मेजबान प्रविष्टि में निर्दिष्ट साइट से कनेक्ट करें. यदि मेजबान प्रविष्टि रिक्त है, "
-"तो एक संवाद प्रस्तुत किया जाता है जो कि किसी URL को दर्ज करने की छूट देगा."
+"मेजबान प्रविष्टि में निर्दिष्ट साइट से कनेक्ट करें. यदि मेजबान प्रविष्टि रिक्त है, तो एक संवाद "
+"प्रस्तुत किया जाता है जो कि किसी URL को दर्ज करने की छूट देगा."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "सभी फ़ाइल"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (कैश) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "कनेक्टेड नहीं है"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s खोलने में त्रुटि: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: दूरस्थ साइट से कनेक्टेड नहीं\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: यह फ़ीचर इस प्रोटोकॉल के प्रयोग से उपलब्ध नहीं है\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: आपको जरूर सिर्फ एक टीम चयनित चाहिए\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: आपको जरूर सिर्फ कम से कम एक मद चयनित चाहिए\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "बदलें"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "जोड़ें"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "रद्द करें"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  हां  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  नहीं  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "निर्देशिका सूचन पा रहा है"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  रोकें  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2755,109 +2729,89 @@ msgstr ""
 "%ld निर्देशिका पाया\n"
 "और %ld फ़ाइल"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP त्रुटि: फ़ाइल %s को %s या %s में नहीं पा सकता है\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "मेजबान संपादित करें"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "मेजबान जोड़ें"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "प्रकार:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "प्रकार (_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "डोमेन"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "संजाल पता"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "संजाल पता (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "नेटमास्क"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "नेटमास्क (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "डोमेन (_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "नेटमास्क"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "स्थानीय मेजबान"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "संपादन"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "संपादन (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "विकल्प"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "लागू करें"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "फ़ाइल नाम पा रहा है..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "जुड़ रहा है..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "फ़ाइल प्राप्त कर रहा है: किसी दूरस्थ साइट से कनेक्टेड नहीं\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "त्रुटि: संतति %d ने %d वापस किया\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "संतति %d ने सफलतापूर्वक वापस किया\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "त्रुटि: संतति %d ठीक से रूकता नहीं है\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "त्रुटि: %s फ़ाइल के बारे में सूचना नहीं पा सकता है: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "फ़ाइल %s नहीं बदला गया था\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2866,115 +2820,153 @@ msgstr ""
 "फ़ाइल %s बदल गया है.\n"
 "क्या आप इसे अपलोड करना चाहते हैं?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "फ़ाइल संपादित करें"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "पूर्ण"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recv %s %s का %.2fKB/s पर, %02d:%02d:%02d अनुमानित शेष समय"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s %s का प्रेषित, हस्तांतरण रूका, अज्ञात समय शेष"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s %s का पाया, हस्तांतरण रूका, अज्ञात समय शेष"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "अज्ञात प्रतिशत पूर्ण. (%ld %ld का फ़ाइल)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 est. शेष समय. (%ld फ़ाइल %ld का)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "फ़ाइल नाम पा रहा है...%s बाइट"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "दृश्य"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "संपादन"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "दृश्य: दूसरी प्रक्रिया बांट नहीं सकता: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "प्रोग्राम चला रहा है: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s को %s के साथ खोल रहा है\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "फ़ाइल %s देख रहा है\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "दृश्य: फ़ाइल %s खोल नहीं सकता है: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "नियंत्रणकारी टर्मिनल %s को खोल नहीं सकता है\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "उपयोक्तानाम [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s पहले से मौजूद है. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  रद्द करें  "
+
+#~ msgid "Host: "
+#~ msgstr "मेजबान: "
+
+#~ msgid "User: "
+#~ msgstr "उपयोक्ता:"
+
+#~ msgid "  Close  "
+#~ msgstr "  बंद करें  "
+
+#~ msgid "Add"
+#~ msgstr "जोड़ें"
+
+#~ msgid "Cancel"
+#~ msgstr "रद्द करें"
+
+#~ msgid "  Yes  "
+#~ msgstr "  हां  "
+
+#~ msgid "  No  "
+#~ msgstr "  नहीं  "
+
+#~ msgid "Type:"
+#~ msgstr "प्रकार:"
+
+#~ msgid "Network Address"
+#~ msgstr "संजाल पता"
+
+#~ msgid "_Edit"
+#~ msgstr "संपादन (_E)"
 
+#~ msgid "Apply"
+#~ msgstr "लागू करें"
diff --git a/po/hr.po b/po/hr.po
index 106fbb8..349b24f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,136 +4,170 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 0\n"
-"POT-Creation-Date: 2004-03-20 14:48+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-03-20 14:48+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija linux hr>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: TransDict server\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
+#, c-format
 msgid "Invalid URL %s\n"
 msgstr "Neispravan URL %s\n"
 
 #: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
+#, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Greška: Pogrešan redak %s u datoteci indeksa međuspremnika\n"
 
-#: lib/cache.c:137 lib/local.c:534
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
+#, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Greška: Ne mogu napraviti direktorij %s: %s\n"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
+#, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Greška: Ne mogu napraviti privremenu datoteku: %s\n"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:262 lib/sshv2.c:1000
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
+#, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Greška prilikom zatvaranja opisnika datoteke: %s\n"
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 "Greška: Ne mogu pretražiti datoteku %s: %s\n"
 
-#: lib/config_file.c:117 lib/config_file.c:124 lib/protocols.c:2735
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Greška: Ne mogu otvoriti lokalnu datoteku %s: %s\n"
 
-#: lib/config_file.c:134 lib/protocols.c:2440 lib/sslcommon.c:480
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Greška: Ne mogu pisati u socket: %s\n"
 
-#: lib/config_file.c:142 lib/protocols.c:2368 lib/sslcommon.c:434
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Greška: Ne mogu čitati sa socketa: %s\n"
 
-#: lib/config_file.c:174 lib/config_file.c:730
+#: lib/config_file.c:183 lib/config_file.c:737
+#, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Greška gFTP-a: Neispravan naziv datoteke s bilješkama %s\n"
 
-#: lib/config_file.c:183
+#: lib/config_file.c:192
+#, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Upozorenje: Ne mogu pronaći glavnu datoteku s bilješkama %s\n"
 
-#: lib/config_file.c:194 lib/config_file.c:736
+#: lib/config_file.c:203 lib/config_file.c:743
+#, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu otvoriti datoteku s bilješkama %s: %s\n"
 
-#: lib/config_file.c:286 lib/config_file.c:308
+#: lib/config_file.c:295 lib/config_file.c:317
+#, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Upozorenje gFTP-a: Preskačem redak %d u datoteci s bilješkama: %s\n"
 
-#: lib/config_file.c:338
+#: lib/config_file.c:347
+#, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Upozorenje gFTP-a: Redak %d ne sadrži dovoljno parametara\n"
 
-#: lib/config_file.c:499
+#: 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 ""
-"Ovaj dio zadaje koja računala su na lokalnoj podmreži pa ne trebate koristiti "
-"proxy poslužitelj (ako je dostupan). Sintaksa: dont_use_proxy=.domena ili "
-"dont_use_proxy=mrežni broj/mrežnamaska"
+"Ovaj dio zadaje koja računala su na lokalnoj podmreži pa ne trebate "
+"koristiti proxy poslužitelj (ako je dostupan). Sintaksa: dont_use_proxy=."
+"domena ili dont_use_proxy=mrežni broj/mrežnamaska"
 
-#: lib/config_file.c:502
+#: 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 ""
-"ext=nastavak datoteke:XPM datoteka:Ascii ili binarna (A ili B):"
-"program za pregled. Napomena: Svi argumenti osim vrste datoteke su nisu obavezni"
+"ext=nastavak datoteke:XPM datoteka:Ascii ili binarna (A ili B):program za "
+"pregled. Napomena: Svi argumenti osim vrste datoteke su nisu obavezni"
 
-#: lib/config_file.c:580 lib/config_file.c:819
+#: lib/config_file.c:587 lib/config_file.c:832
+#, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Greška gFTP-a: Neispravan naziv datoteke s postavkama %s\n"
 
-#: lib/config_file.c:591
+#: lib/config_file.c:598
+#, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu napraviti direktorij %s: %s\n"
 
-#: lib/config_file.c:601
+#: lib/config_file.c:608
+#, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Greška gFTP-a: Ne mogu pronaći glavnu datoteku s postavkama %s\n"
 
-#: lib/config_file.c:603
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr "Jeste li instalirali program (make install)?\n"
 
-#: lib/config_file.c:612 lib/config_file.c:825
+#: lib/config_file.c:619 lib/config_file.c:838
+#, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu otvoriti datoteku s postavkama %s: %s\n"
 
-#: lib/config_file.c:651
+#: lib/config_file.c:658
+#, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Prekidanje zbog greške pri obradi retka %d u datoteci s postavkama\n"
 
-#: lib/config_file.c:657
+#: lib/config_file.c:664
+#, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Upozorenje gFTP-a: Preskačem redak %d u datoteci s postavkama: %s\n"
 
-#: lib/config_file.c:664
+#: lib/config_file.c:671
+#, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Greška gFTP-a: Neispravno ime dnevničke datoteke %s\n"
 
-#: lib/config_file.c:670
+#: lib/config_file.c:677
+#, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Upozorenje gFTP-a: Ne mogu otvoriti %s za pisanje: %s\n"
 
-#: lib/config_file.c:725
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
-"Datoteka s bilješkama za gFTP. Sva prava zadržana (C) 1998–2002 Brian Masney  "
-"<masneyb gftp org>. Upozorenje: Svi komentari koje "
-"dodate ovoj datoteci biti će obrisani"
+"Datoteka s bilješkama za gFTP. Sva prava zadržana (C) 1998–2002 Brian "
+"Masney  <masneyb gftp org>. Upozorenje: Svi komentari koje dodate ovoj "
+"datoteci biti će obrisani"
 
-#: lib/config_file.c:726
+#: 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 "
@@ -145,190 +179,248 @@ msgstr ""
 "lozinku dok stoji dok uređujete ovu datoteku. Prije toga, sve lozinke su "
 "spremljenje u izvornim tekstualnom obliku."
 
-#: lib/config_file.c:832
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Datoteka s postavkama za gFTP. Sva prava zadržana (C) 1998-2002 Brian Masney "
-"<masneyb gftp org>. Upozorenje: Svi komentari u "
-"datoteci će biti obrisani. Ako unos sadrži (*) u svom komentaru, onda ga ne "
-"možete promijeniti iz gFTP-a"
+"<masneyb gftp org>. Upozorenje: Svi komentari u datoteci će biti obrisani. "
+"Ako unos sadrži (*) u svom komentaru, onda ga ne možete promijeniti iz gFTP-a"
 
-#: lib/config_file.c:1196 lib/rfc2068.c:560 lib/rfc2068.c:561
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nepoznato>"
 
-#: lib/config_file.c:1272 lib/config_file.c:1335 lib/config_file.c:1377
-#: lib/config_file.c:1410
+#: 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 "Kobna greška gFTP-a: Odabir postavke \"%s\" nije nađen u općoj hash tablici\n"
-
-#: lib/ftps.c:137
-msgid ""
-"FTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
 msgstr ""
-"Podrška za FTPS nije dostupna, jer podrška za SSL nije prisutna. Prekidam "
-"vezu.\n"
+"Kobna greška gFTP-a: Odabir postavke \"%s\" nije nađen u općoj hash tablici\n"
 
-#: lib/https.c:90
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Podrška za HTTPS nije dostupna je podrška za SSL nije "
-"prisutna. Prekidam vezu.\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Greška: Ne mogu otvoriti lokalnu datoteku %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Ne mogu promijeniti lokalni direktorij u %s: %s\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Greška: Ne mogu pretražiti datoteku %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-msgid "Could not get current working directory: %s\n"
-msgstr "Ne mogu dohvatiti trenutni direktorij: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Greška: Greška prilikom upisa u %s: %s\n"
 
-#: lib/local.c:179
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Greška: Ne mogu skratiti lokalnu datoteku %s: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "Ne mogu prihvatiti vezu s poslužiteljem: %s\n"
 
-#: lib/local.c:404
-msgid "Could not get local directory listing %s: %s\n"
+#: 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 "nepoznato"
+
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Ne mogu dohvatiti popis lokalnih direktorija %s: %s\n"
 
-#: lib/local.c:441
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "Uspješno promijenjen lokalni direktorij u %s\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:229
-#: src/gtk/view_dialog.c:328
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Ne mogu promijeniti lokalni direktorij u %s: %s\n"
+
+#: 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:304
+#, c-format
 msgid "Successfully removed %s\n"
 msgstr "Uspješno uklonjeno %s\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
+#, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Greška: Ne mogu ukloniti direktorij %s: %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:233 src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
+#, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Greška: Ne mogu ukloniti datoteku  %s: %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
+#, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Uspješno stvoren direktorij  %s\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
+#, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Uspješno preimenovano  %s u %s\n"
 
-#: lib/local.c:560
+#: lib/fsp.c:575 lib/local.c:597
+#, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Greška: Ne mogu preimenovati %s u %s: %s\n"
 
-#: lib/local.c:583
-msgid "Successfully changed mode of %s to %d\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podrška za FTPS nije dostupna, jer podrška za SSL nije prisutna. Prekidam "
+"vezu.\n"
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podrška za HTTPS nije dostupna je podrška za SSL nije prisutna. Prekidam "
+"vezu.\n"
+
+#: lib/local.c:66
+#, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr "Ne mogu dohvatiti trenutni direktorij: %s\n"
+
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Uspješno promijenjen lokalni direktorij u %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Ne mogu promijeniti lokalni direktorij u %s: %s\n"
+
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Greška: Ne mogu skratiti lokalnu datoteku %s: %s\n"
+
+#: lib/local.c:424
+#, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Ne mogu dohvatiti popis lokalnih direktorija %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Uspješno promijenjen način rada %s u %d\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Greška: Ne mogu promijeniti način rada %s u %d: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
 msgstr "Uspješno promijenjen način rada %s u %d\n"
 
-#: lib/local.c:590
-msgid "Error: Could not change mode of %s to %d: %s\n"
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Greška: Ne mogu promijeniti način rada %s u %d: %s\n"
 
-#: lib/local.c:682
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalni datotečni sustav"
 
-#: lib/misc.c:415
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uporaba: gftp "
 
-#: lib/misc.c:415 src/uicommon/gftpui.c:616
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ništa"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "datoteka"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "veličina"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "korisnik"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "grupa"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datum i vrijeme"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributi"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "silazno"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "uzlazno"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Općenito"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Program za pregled:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
 msgstr ""
-"Uobičajeni program za pregled datoteka. Ako ovo ostavite prazno, "
-"koristiti će se ugrađeni program za pregled"
+"Uobičajeni program za pregled datoteka. Ako ovo ostavite prazno, koristiti "
+"će se ugrađeni program za pregled"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Program za uređivanje:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Uobičajeni program za uređivanje datoteka"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Početni direktorij:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Uobičajeni direktorij u kome će gFTP biti pri pokretanju"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Najveća veličina dnevničkog prozora:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
-msgstr "Najveća veličina dnevničkog prozora u bajtovima za GTK+ inačicu programa"
+msgstr ""
+"Najveća veličina dnevničkog prozora u bajtovima za GTK+ inačicu programa"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Udaljeni znakovni skupovi:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -336,146 +428,207 @@ msgstr ""
 "Ovo je popis znakocnih skupova razdvojenih zarezom za pokušaj prilagođavanja "
 "udaljenih poruka trenutnim lokalnim postavkama"
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL međuspremnika:"
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
-msgstr "Broj sekundi za zadržavanje stavki međuspremnika prije njihovog isteka."
+msgstr ""
+"Broj sekundi za zadržavanje stavki međuspremnika prije njihovog isteka."
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Nadoveži prijenose datoteka"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Nadoveži nove prijenose datoteka na postojeće"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Jedan po jedan prijenos"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Radi samo jedan po jedan prijenos?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Prepisivanje je uobičajeno"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Prepisivanje datoteka ili nastavak prijenosa datoteka su uobičajeni"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Spremi dozvole datoteka"
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Spremi dozvole prenešenih datoteka"
 
-#: lib/options.h:75
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "Spremi dozvole datoteka"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "Spremi dozvole prenešenih datoteka"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Osvježi nakon svakog prijenosa datoteke"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Osvježi popis nakon što je svaka datoteka prenesena"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Prvo poredaj direktorije"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Pokaži prvo direktorije pa zatim datoteke"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Pokaži skrivene datoteke"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Pokaži skrivene datoteke u popisu"
 
-#: lib/options.h:88
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Prikaži stanje prijenosa u naslovnoj traci"
 
-#: lib/options.h:90
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Prikaži stanje prijenosa datoteke u naslovnoj traci"
 
-#: lib/options.h:91
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Pokreni prijenos datoteka"
 
-#: lib/options.h:93
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Autmatski pokreče prijenos datoteka kad se postave u nizu čekanja."
 
-#: lib/options.h:95
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Omogućuje upisivanje ručnih naredbi u grafičko sučelje"
 
-#: lib/options.h:97
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr "Omogućuje upisivanje ručnih naredbi u grafičko sučelje (funkcije kao što su tekst port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+"Omogućuje upisivanje ručnih naredbi u grafičko sučelje (funkcije kao što su "
+"tekst port)"
 
-#: lib/options.h:99 src/gtk/options_dialog.c:1051
-#: src/gtk/options_dialog.c:1144
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Uklanja lokalni direktorij"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Mreža"
 
-#: lib/options.h:101
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Dozvoljeno vrijeme čekanja:"
 
-#: lib/options.h:104
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "Dozvoljeno vrijeme čekanja za mrežni ulaz/izlaz. Ovo NIJE istek vremena za besposleni rad."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"Dozvoljeno vrijeme čekanja za mrežni ulaz/izlaz. Ovo NIJE istek vremena za "
+"besposleni rad."
 
-#: lib/options.h:106
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Pokušaja povezivanja:"
 
-#: lib/options.h:109
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
-msgstr """Broj ponovnih auto-pokušaja. Postavite ovo na 0 da bi se pokušavalo "
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
+msgstr ""
+"Broj ponovnih auto-pokušaja. Postavite ovo na 0 da bi se pokušavalo "
 "neodređeno mnogo puta"
 
-#: lib/options.h:111
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Čekanje prije ponovnog pokušaja:"
 
-#: lib/options.h:114
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Broj sekundi čekanja između pokušaja"
 
-#: lib/options.h:115
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maks KB/s:"
 
-#: lib/options.h:118
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
-msgstr """Najveći broj KB/s koji prijenos datoteke može imati. (Postavite na 0 da "
+msgstr ""
+"Najveći broj KB/s koji prijenos datoteke može imati. (Postavite na 0 da "
 "biste isključili)"
 
-#: lib/options.h:121
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "Prijenos datoteka"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Uobičajeni protokol:"
 
-#: lib/options.h:123
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ovo zadaje uobičajeni protokol koji će se koristiti"
 
-#: lib/options.h:125 lib/options.h:128
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Omogućuje podršku za IPv6"
 
-#: lib/options.h:133
+#: lib/options.h:159
 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"
@@ -483,27 +636,27 @@ msgstr ""
 "Ovo zadaje šta će se desiti kada dva puta pritisnete ime datoteke u popisu.  "
 "0=Pregledaj datoteku 1=Uredi datoteku 2=Prenesi datoteku"
 
-#: lib/options.h:136
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Uobičajena širina popisa lokalnih datoteka"
 
-#: lib/options.h:139
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Uobičajena širina popisa udaljenih datoteka"
 
-#: lib/options.h:142
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Uobičajena visina popisa lokalnih/udaljenih datoteka"
 
-#: lib/options.h:145
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Uobičajena visina popisa prijenosa"
 
-#: lib/options.h:148
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Uobičajena visina dnevničkog prozora"
 
-#: lib/options.h:151
+#: 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."
@@ -511,15 +664,15 @@ msgstr ""
 "Širina stupca s imenom datoteke u prozoru prijenosa. Postavite ovo na 0 kako "
 "bi se ovaj stupac automatski proširivao."
 
-#: lib/options.h:155 lib/options.h:161
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Uobičajeni stupac po kojem se vrši razvrstavanje"
 
-#: lib/options.h:158 lib/options.h:164
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Poredaj u rastućem ili padajućem poretku"
 
-#: lib/options.h:168 lib/options.h:186
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -528,16 +681,16 @@ msgstr ""
 "kako bi se stupac automatski proširivao. Postavite ovo na -1 da biste "
 "isključili ovaj stupac"
 
-#: lib/options.h:171 lib/options.h:189
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Širina stupca s veličinom datoteke u popisima datoteka. Postavite ovo na "
-"0 kako bi se stupac automatski proširivao. Postavite ovo na -1 da biste "
+"Širina stupca s veličinom datoteke u popisima datoteka. Postavite ovo na 0 "
+"kako bi se stupac automatski proširivao. Postavite ovo na -1 da biste "
 "isključili ovu stupac"
 
-#: lib/options.h:174 lib/options.h:192
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -546,184 +699,174 @@ msgstr ""
 "kako bi se stupac automatski proširivo. Postavite ovo na -1 da biste "
 "isključili ovaj stupac"
 
-#: lib/options.h:177 lib/options.h:195
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Širina stupca s nazivom grupe u popisima datoteka. Postavite ovo na 0 "
-"kako bi se stupac automatski proširivao. Postavite ovo na -1 da biste "
-"isključili ovaj stupac"
+"Širina stupca s nazivom grupe u popisima datoteka. Postavite ovo na 0 kako "
+"bi se stupac automatski proširivao. Postavite ovo na -1 da biste isključili "
+"ovaj stupac"
 
-#: lib/options.h:180 lib/options.h:198
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Širina stupca s datumom u popisima datoteka. Postavite ovo na 0 kako bi "
-"se stupac automatski proširivao. Postavite ovo na -1 da biste isključili "
-"ovaj stupac"
+"Širina stupca s datumom u popisima datoteka. Postavite ovo na 0 kako bi se "
+"stupac automatski proširivao. Postavite ovo na -1 da biste isključili ovaj "
+"stupac"
 
-#: lib/options.h:183 lib/options.h:201
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"Širina stupca s atributima u popisima datoteka. Postavite ovo na 0 kako "
-"bi se stupac automatski proširivao. Postavite ovo na -1 da biste "
-"isključili ovaj stupac"
+"Širina stupca s atributima u popisima datoteka. Postavite ovo na 0 kako bi "
+"se stupac automatski proširivao. Postavite ovo na -1 da biste isključili "
+"ovaj stupac"
 
-#: lib/options.h:204
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Boja naredbi koje se šalju na poslužitelj"
 
-#: lib/options.h:207
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Boja naredbi koje stižu od poslužitelja"
 
-#: lib/options.h:210
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Boja poruka s greškama"
 
-#: lib/options.h:213
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Boja ostalih dnevničkih poruka"
 
-#: lib/options.h:219 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:222 lib/options.h:224
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: lib/options.h:227 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:230 lib/options.h:232
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:235
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokalno"
 
-#: lib/options.h:237
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:239 src/gtk/bookmarks.c:882
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Knjižna bilješka"
 
-#: lib/protocols.c:221
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
+#, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Prijenos datoteke će biti ograničen na %.2f KB/s\n"
 
-#: lib/protocols.c:329
-msgid "Loading directory listing %s from cache\n"
+#: lib/protocols.c:379
+#, c-format
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Učitavanje popisa direktorija %s iz međuspremnika\n"
 
-#: lib/protocols.c:530
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
+msgstr "Učitavanje popisa direktorija %s iz međuspremnika\n"
+
+#: lib/protocols.c:450
+#, 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:481
+#, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Greška: Ne mogu upisati u međuspremnik: %s\n"
 
-#: lib/protocols.c:562
+#: lib/protocols.c:514
+#, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Greška: ne mogu pronaći bilješku %s\n"
 
-#: lib/protocols.c:569
+#: lib/protocols.c:521
+#, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Greška s bilješkama: bilješka %s ne sadrži ime računala\n"
 
-#: lib/protocols.c:678
+#: lib/protocols.c:643 lib/protocols.c:670
+#, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokol \"%s\" trenutno nije podržan.\n"
 
-#: lib/protocols.c:1021 lib/protocols.c:1036 lib/protocols.c:1959
-#: lib/protocols.c:2068
-msgid "Looking up %s\n"
-msgstr "Tražim %s\n"
-
-#: lib/protocols.c:1027 lib/protocols.c:1042 lib/protocols.c:1964
-#: lib/protocols.c:2073
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Ne mogu pronaći računalo  %s: %s\n"
-
-#: lib/protocols.c:1333 lib/protocols.c:1334 lib/protocols.c:1375
-#: lib/protocols.c:1376 lib/protocols.c:1435 lib/protocols.c:1442
-#: lib/protocols.c:1521 lib/protocols.c:1522 lib/protocols.c:1556
-msgid "unknown"
-msgstr "nepoznato"
-
-#: lib/protocols.c:1982
-msgid "Failed to create a socket: %s\n"
-msgstr "Nisam uspio napraviti socket: %s\n"
-
-#: lib/protocols.c:1988 lib/protocols.c:2087
-msgid "Trying %s:%d\n"
-msgstr "Pokušavam %s:%d\n"
-
-#: lib/protocols.c:1993 lib/protocols.c:2094
-msgid "Cannot connect to %s: %s\n"
-msgstr "Ne mogu se spojiti na %s: %s\n"
-
-#: lib/protocols.c:2025 lib/rfc959.c:623
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Nisam uspio stvoriti vezu za IPv4: %s\n"
-
-#: lib/protocols.c:2049 lib/sshv2.c:898
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr """Ne mogu pronaći naziv servisae %s/tcp. Molim provjerite vašu datoteku sa "
-"servisima\n"
-
-#: lib/protocols.c:2111 lib/protocols.c:2744 lib/rfc959.c:632 lib/rfc959.c:782
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Greška: Ne mogu postavitim oznaku zatvaranja pri izvršavanju: %s\n"
-
-#: lib/protocols.c:2118
-msgid "Connected to %s:%d\n"
-msgstr "Povezan na %s:%d\n"
-
-#: lib/protocols.c:2348 lib/protocols.c:2419
-msgid "Connection to %s timed out\n"
-msgstr "Povezivanje na %s je isteklo\n"
-
-#: lib/protocols.c:2488
-msgid "Cannot get socket flags: %s\n"
-msgstr "Ne mogu dohvatiti oznake socketa: %s\n"
-
-#: lib/protocols.c:2502
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Ne mogu postavitim socket u neblokirajući način rada: %s\n"
+#: lib/protocols.c:1153
+#, c-format
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:2638
+#: lib/protocols.c:1531
+#, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr """Greška: Udaljeno mjesto %s je prekinulo vezu. Najveći broj pokušaja je "
+msgstr ""
+"Greška: Udaljeno mjesto %s je prekinulo vezu. Najveći broj pokušaja je "
 "dostignut...odustajem\n"
 
-#: lib/protocols.c:2646
+#: lib/protocols.c:1539
+#, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr """Greška: Udaljeno mjesto %s je prekinulo vezu. Pokušati ću ponovno "
+msgstr ""
+"Greška: Udaljeno mjesto %s je prekinulo vezu. Pokušati ću ponovno "
 "povezivanje za %d sekundi\n"
 
-#: lib/pty.c:288
+#: lib/protocols.c:1634 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 "Greška: Ne mogu postavitim oznaku zatvaranja pri izvršavanju: %s\n"
+
+#: lib/pty.c:301
+#, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Ne mogu otvoriti glavni pty %s: %s\n"
+
+#: lib/pty.c:309
+#, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Ne mogu napraviti par socketa: %s\n"
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
+#, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Greška: Ne mogu izvršiti ssh: %s\n"
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
+#, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Ne mogu forkati proces: %s\n"
 
-#: lib/pty.c:338
-msgid "Cannot open master pty %s: %s\n"
-msgstr "Ne mogu otvoriti glavni pty %s: %s\n"
-
 #: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy korisnik:"
@@ -764,7 +907,8 @@ msgstr "Koristi HTTP/1.1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Želite li koristiti HTTP/1.1 ili HTTP/1.0"
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:853
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
+#, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
@@ -772,31 +916,26 @@ msgstr ""
 "Primljen je pogrešan odgovor poslužitelja, prekidam vezu\n"
 "Udaljeni poslužitelj je vratio neispravnu veličinu odjeljka '%s'\n"
 
-#: lib/rfc2068.c:257 lib/rfc959.c:592 lib/sshv2.c:995
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
+#, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Prekidam vezu s  %s\n"
 
-#: lib/rfc2068.c:306
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "Pokrećem prijenos datoteke s pomakom %lld\n"
-
-#: lib/rfc2068.c:314
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "Pokrećem prijenos datoteke s pomakom %ld\n"
 
-#: lib/rfc2068.c:336
+#: lib/rfc2068.c:322
+#, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Ne mogu dohvatiti datoteku %s\n"
 
-#: lib/rfc2068.c:435 lib/sshv2.c:1080
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Dohvaćam popis direktorija...\n"
 
-#: lib/rfc2068.c:834 lib/sshv2.c:716 lib/sshv2.c:729 lib/sshv2.c:751
-#: lib/sshv2.c:819 lib/sshv2.c:951 lib/sshv2.c:1042 lib/sshv2.c:1110
-#: lib/sshv2.c:1223 lib/sshv2.c:1236 lib/sshv2.c:1249 lib/sshv2.c:1262
-#: lib/sshv2.c:1318 lib/sshv2.c:1383 lib/sshv2.c:1843 lib/sshv2.c:1946
-#: lib/sshv2.c:2040 lib/sshv2.c:2125 lib/sshv2.c:2211
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Primljen je pogrešan odgovor s poslužitelja, prekidam vezu\n"
 
@@ -841,8 +980,8 @@ msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
-"Ovo je lozinka koja će se koristiti kada se prijavljujete anonimno na "
-"FTP poslužitelj"
+"Ovo je lozinka koja će se koristiti kada se prijavljujete anonimno na FTP "
+"poslužitelj"
 
 #: lib/rfc959.c:59
 msgid "Proxy account:"
@@ -857,6 +996,7 @@ msgid "Proxy server type:"
 msgstr "Vrsta proxy poslužitelja:"
 
 #: lib/rfc959.c:66
+#, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
 "2 character replacement string prefixed by a % that will be replaced with "
@@ -865,18 +1005,30 @@ msgid ""
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
 msgstr ""
-"Ovo određuje na koji način vaš proxy poslužitelj očekuje prijavu. "
-"Možete navesti tekst za zamjenu od 2 znaka kojima prethodi % i on će biti "
-"zamijenjen odgovarajućim podacima. Prvi znak može biti ili p za proxy ili  "
-"h za račznalo ili FTP poslužitelj. Drugㄩ znak može biti u (user), p (pass), "
-"h (host), o (port) ili a (account). Npr., za navođenje proxy korisnika unesite "
+"Ovo određuje na koji način vaš proxy poslužitelj očekuje prijavu. Možete "
+"navesti tekst za zamjenu od 2 znaka kojima prethodi % i on će biti "
+"zamijenjen odgovarajućim podacima. Prvi znak može biti ili p za proxy ili  h "
+"za račznalo ili FTP poslužitelj. Drugㄩ znak može biti u (user), p (pass), h "
+"(host), o (port) ili a (account). Npr., za navođenje proxy korisnika unesite "
 "%pu"
 
 #: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasivan način prijenosa datoteka"
 
-#: 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. "
@@ -885,18 +1037,18 @@ msgid ""
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
 msgstr ""
-"Ukoliko je ovo uključeno, onda će udaljeni FTP poslužitelj otvoriti port za ovo "
-"podatkovno povezivanje. Ukoliko ste iza vatrozida, morati ćete ovo "
+"Ukoliko je ovo uključeno, onda će udaljeni FTP poslužitelj otvoriti port za "
+"ovo podatkovno povezivanje. Ukoliko ste iza vatrozida, morati ćete ovo "
 "uključiti. Općenito, poželjno je da ovo bude uključeno osim ukoliko se "
 "povezujete s starijim FTP poslužiteljem koji ovo ne podržava. Ukoliko je ovo "
-"isključeno, onda će gFTP otvoriti port na strani klijenta a udaljeni poslužitelj "
-"će se pokušati s njim povezati."
+"isključeno, onda će gFTP otvoriti port na strani klijenta a udaljeni "
+"poslužitelj će se pokušati s njim povezati."
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Razrješi udaljene simboličke veze (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 "
@@ -904,82 +1056,156 @@ msgid ""
 "option to LIST"
 msgstr ""
 "Udaljeni FTP poslužitelj će pokušati razrješiti simboličke veze u popisima "
-"direktorija. Uopće, poželjno je ovo ostaviti uključeno. Jedina situacija "
-"u kojoj ovo želite isključiti je kada udaljeni FTP poslužitelj ne podržava -L "
+"direktorija. Uopće, poželjno je ovo ostaviti uključeno. Jedina situacija u "
+"kojoj ovo želite isključiti je kada udaljeni FTP poslužitelj ne podržava -L "
 "opciju naredbe LIST"
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Prenesi datoteke u ASCII način radu"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 "Ukoliko prenosite tekstualnu datoteku s Windowsa na Unix ili obrnuto, onda "
-"bi trebali ovo uključiti. Svaki sustav predstavlja nove redove na "
-"drugačiji način u tekstualnim datotekama. Ukoliko prenosite s Unixa na "
-"Unix, onda možete ostaviti isključeno. Ukoliko preuzimate binarne podatke, "
-"potrebno je ovo isključiti."
+"bi trebali ovo uključiti. Svaki sustav predstavlja nove redove na drugačiji "
+"način u tekstualnim datotekama. Ukoliko prenosite s Unixa na Unix, onda "
+"možete ostaviti isključeno. Ukoliko preuzimate binarne podatke, potrebno je "
+"ovo isključiti."
 
-#: lib/rfc959.c:314 lib/rfc959.c:323 lib/rfc959.c:334 lib/rfc959.c:746
-#: lib/rfc959.c:1336
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Primljen je neispravan odaziv  \"%c\" s poslužitelja.\n"
 
-#: lib/rfc959.c:661 lib/rfc959.c:671
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Nisam uspio stvoriti vezu za 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 "Ne mogu pronaći IP adresu u PASV odgovoru ‘%s’\n"
 
-#: lib/rfc959.c:686 lib/rfc959.c:844
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Ne mogu pronaći IP adresu u PASV odgovoru ‘%s’\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
+#, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Ne mogu napraviti podatkovnu vezu: %s\n"
 
-#: lib/rfc959.c:698 lib/rfc959.c:719 lib/rfc959.c:869
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
+#, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Ne mogu dohvatiti naziv socketa: %s\n"
 
-#: lib/rfc959.c:709 lib/rfc959.c:859
+#: lib/rfc959.c:809 lib/rfc959.c:960
+#, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Ne mogu osluškivati (bind) na portu: %s\n"
 
-#: lib/rfc959.c:728 lib/rfc959.c:878
+#: lib/rfc959.c:828 lib/rfc959.c:979
+#, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Ne mogu osluškivati na portu %d: %s\n"
 
-#: lib/rfc959.c:773
+#: lib/rfc959.c:876
+#, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Nisam uspio stvoriti vezu za IPv6: %s\n"
 
-#: lib/rfc959.c:793
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Greška: Izgleda da nismo povezani pomoću IPv6. Prekidam vezu.\n"
 
-#: lib/rfc959.c:822 lib/rfc959.c:831
+#: lib/rfc959.c:923 lib/rfc959.c:932
+#, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Neispravan EPSV odgovor \"%s\"\n"
 
-#: lib/rfc959.c:888
+#: lib/rfc959.c:989
+#, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Ne mogu dohvatiti adresu lokalnog socketa: %s\n"
 
-#: lib/rfc959.c:959
+#: lib/rfc959.c:1076
+#, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Ne mogu prihvatiti vezu s poslužiteljem: %s\n"
 
-#: lib/rfc959.c:1478
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ukupno"
 
-#: lib/rfc959.c:1480
+#: lib/rfc959.c:1586
+#, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Upozorenje: Ne mogu da obraditi popis %s\n"
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Tražim %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 "Ne mogu pronaći računalo  %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Nisam uspio napraviti socket: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Pokušavam %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 "Ne mogu se spojiti na %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Povezan na %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 ""
+"Ne mogu pronaći naziv servisae %s/tcp. Molim provjerite vašu datoteku sa "
+"servisima\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Povezivanje na %s je isteklo\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Ne mogu dohvatiti oznake socketa: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Ne mogu postavitim socket u neblokirajući način rada: %s\n"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -1000,202 +1226,194 @@ msgstr "Dodatni parametri SSH programa:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Dodatni parametriza SSH program "
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr "SSH2 sftp-poslužitelj putanja:"
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr "Uobičajena putanja udaljenog SSH2 sftp poslužitelja"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Potrebni su SSH korisničko ime/lozinka"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Zahtjevaj korisničko ime/lozinku za povezivanje SSH-om"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr "Koristi alat ssh-askpass"
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "Koristi ssh-askpass alat za pribavljanje lozinke korisnika"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "Pokrećem program %s\n"
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "Koristi podsustav SSH2 - SFTP"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
-"Pozovite s ssh -s zastavicom. Ovo je korisno jer ne morate znati "
-"putanju do udaljenog sftp poslužitelja"
 
-#: lib/sshv2.c:259
-msgid "Running program %s\n"
-msgstr "Pokrećem program %s\n"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
 
-#: lib/sshv2.c:306 lib/sshv2.c:331
-msgid "WARNING"
-msgstr "UPOZORENJE"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Lozinka:"
 
-#: lib/sshv2.c:373
-msgid "Error: An incorrect password was entered\n"
-msgstr "Greška: Unesena je neispravna lozinka\n"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr ""
 
-#: lib/sshv2.c:376
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
-"Molim spojite se na ovo ačunalo koristeći program SSH iz naredbne "
-"linije i prikladno odgovorite na ovo pitanje.\n"
 
-#: lib/sshv2.c:379
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr """Molim vas da ispravite gornje upozorenje kako biste se povezali s ovim "
-"računalom.\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Upišite šifru"
 
-#: lib/sshv2.c:418
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "Upišite šifru"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "Greška: Unesena je neispravna lozinka\n"
+
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicijalizacija protokola\n"
 
-#: lib/sshv2.c:424
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Inačica protokola %d\n"
 
-#: lib/sshv2.c:433
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Otvori %s\n"
 
-#: lib/sshv2.c:438
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Zatvori\n"
 
-#: lib/sshv2.c:444
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Otvori mapu %s\n"
 
-#: lib/sshv2.c:449
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Čitaj mapu\n"
 
-#: lib/sshv2.c:453
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Ukloni datoteku %s\n"
 
-#: lib/sshv2.c:458
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Kreiraj mapu %s\n"
 
-#: lib/sshv2.c:463
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Ukloni mapu %s\n"
 
-#: lib/sshv2.c:468
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Stvarna putanja %s\n"
 
-#: lib/sshv2.c:473
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: osobine datoteke\n"
 
-#: lib/sshv2.c:477
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: lib/sshv2.c:494
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: lib/sshv2.c:499
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:512 src/gtk/bookmarks.c:1041 src/gtk/bookmarks.c:1286
-#: src/gtk/chmod_dialog.c:281 src/gtk/gtkui_transfer.c:361
-#: src/gtk/misc-gtk.c:970 src/gtk/options_dialog.c:1109
-#: src/gtk/options_dialog.c:1311
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "U redu"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ne postoji datoteka ili mapa"
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Neuspjeh"
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Loša poruka"
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Veza nije uspostavljena"
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Veza izgubljena"
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operacija nije podržana"
 
-#: lib/sshv2.c:539
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Poslužitelj je vratio nepoznatu poruku"
 
-#: lib/sshv2.c:576
+#: lib/sshv2.c:752
+#, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Greška: Veličina poruke %d je prevelika\n"
 
-#: lib/sshv2.c:634 lib/sshv2.c:1119 lib/sshv2.c:1955 lib/sshv2.c:2049
-#: lib/sshv2.c:2137
+#: 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 "Greška: Veličina poruke %d s poslužitelja je prevelika\n"
 
-#: lib/sshv2.c:640
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
-"Došlo je do greške pri inicijalizaciji SSH veze na udaljeni "
-"poslužiteljom. Greška s udaljenog poslužitelja slijedi:\n"
+"Došlo je do greške pri inicijalizaciji SSH veze na udaljeni poslužiteljom. "
+"Greška s udaljenog poslužitelja slijedi:\n"
 
-#: lib/sshv2.c:869
+#: lib/sshv2.c:1160
+#, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Otvaram SSH vezu na %s\n"
 
-#: lib/sshv2.c:962
+#: lib/sshv2.c:1212
+#, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Uspješno prijavljen na SSH poslužitelj %s\n"
 
@@ -1224,6 +1442,7 @@ msgid "Verify SSL Peer"
 msgstr "Provjeri SSL točku"
 
 #: lib/sslcommon.c:107
+#, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
 "Issuer = %s\n"
@@ -1239,136 +1458,131 @@ msgstr ""
 msgid "Cannot get peer certificate\n"
 msgstr "Ne mogu dobiti potvrdu od druge strae\n"
 
-#: lib/sslcommon.c:188
+#: lib/sslcommon.c:196
+#, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
-"GREŠKA: računalo u SSL certifikatu (%s) se ne poklapa s računaloom s kojim smo "
-"povezani (%s). Prekidam vezu.\n"
+"GREŠKA: računalo u SSL certifikatu (%s) se ne poklapa s računaloom s kojim "
+"smo povezani (%s). Prekidam vezu.\n"
 
-#: lib/sslcommon.c:295
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+#, fuzzy
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Ne mogu pokrenuti OpenSSL biblioteku\n"
 
-#: lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Greška pri učitavanju uobičajenih SSL certifikata \n"
 
-#: lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Greška pri postavljanju popisa šifri (nema ispravnih šifri)\n"
 
-#: lib/sslcommon.c:342 lib/sslcommon.c:414 lib/sslcommon.c:461
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Greška:  SSL nije inicijaliziran\n"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Greška pri uspostavljanju SSL veze (objekt BIO)\n"
 
-#: lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Greška pri uspostavljanju SSL veze (objekt SSL)\n"
 
-#: lib/sslcommon.c:390
+#: lib/sslcommon.c:392
+#, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Greška s potvrdom druge strane: %s\n"
 
-#: src/uicommon/gftpui.c:62
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Čekam %d sekundi do sljedećeg ponovnog pokušaja povezivanja\n"
-
-#: src/uicommon/gftpui.c:72 src/gtk/chmod_dialog.c:74
-#: src/gtk/delete_dialog.c:89 src/gtk/transfer.c:213
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operacija je otkazana\n"
 
-#: src/uicommon/gftpui.c:146
-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 ""
-">. Ako imate pitanja, komentare, ili prijedloge za ovaj program, slobodno mi "
-"ih pošaljite e-poštom. Najnovije vijesti o gFTP-u uvijek možete saznati na mojoj "
-"web stanici  na adresi http://www.gftp.org/\n";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Čekam %d sekundi do sljedećeg ponovnog pokušaja povezivanja\n"
 
-#: src/uicommon/gftpui.c:147
+#: 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 dolazi BEZ IKAKVE GARANCIJE; za detalje pogledajte datoteku "
-"COPYING. Ovo je slobodni softver, a vi ste pozvani da ga dijelite pod "
-"određenim uvjetima; za detalje, pogledajte datoteku COPYING\n"
+"gFTP dolazi BEZ IKAKVE GARANCIJE; za detalje pogledajte datoteku COPYING. "
+"Ovo je slobodni softver, a vi ste pozvani da ga dijelite pod određenim "
+"uvjetima; za detalje, pogledajte datoteku COPYING\n"
 
-#: src/uicommon/gftpui.c:149 src/gtk/menu-items.c:495
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Preveli:  "
 
-#: src/uicommon/gftpui.c:196 src/uicommon/gftpui.c:238
-#: src/uicommon/gftpui.c:278 src/uicommon/gftpui.c:313
-#: src/uicommon/gftpui.c:348 src/uicommon/gftpui.c:383
-#: src/uicommon/gftpui.c:419 src/uicommon/gftpui.c:482
-#: src/uicommon/gftpui.c:563 src/uicommon/gftpui.c:828
+#: 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 "Greška: Nisam povezan s udaljenim mjestom\n"
 
-#: src/uicommon/gftpui.c:207
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "upotreba: chmod <način rada> <datoteka>\n"
 
-#: src/uicommon/gftpui.c:248
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "upotreba: rename <staro ime> <novo ime>\n"
 
-#: src/uicommon/gftpui.c:284
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "upotreba: delete <datoteka>\n"
 
-#: src/uicommon/gftpui.c:319
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "upotreba: rmdir <direktorij>\n"
 
-#: src/uicommon/gftpui.c:354
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uporaba: računalo <naredba za računalo>\n"
 
-#: src/uicommon/gftpui.c:389
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "upotreba: mkdir <novi direktorij>\n"
 
-#: src/uicommon/gftpui.c:425 src/uicommon/gftpui.c:442
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "upotreba: chdir <direktorij>\n"
 
-#: src/uicommon/gftpui.c:514
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Neispravan argument\n"
 
-#: src/uicommon/gftpui.c:527
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Očisti međuspremnik direktorija\n"
 
-#: src/uicommon/gftpui.c:616
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uporaba: open "
 
-#: src/uicommon/gftpui.c:691
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "upotreba: set [varijabla = vrijednost]\n"
 
-#: src/uicommon/gftpui.c:705
+#: src/uicommon/gftpui.c:718
+#, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Greška: Varijabla %s nije ispravna varijabla podešavanja.\n"
 
-#: src/uicommon/gftpui.c:712
+#: src/uicommon/gftpui.c:725
+#, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Greška: varijabla %s nije dostupna u tekstualnoj inačici gFTP-a\n"
 
-#: src/uicommon/gftpui.c:792
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1376,274 +1590,302 @@ msgstr ""
 "Podržane naredbe:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:835
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uporaba: %s <datoteka s odrednicama>\n"
 
-#: src/uicommon/gftpui.c:920
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "o programu"
 
-#: src/uicommon/gftpui.c:921
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Pokaži informacije o gFTP-u"
 
-#: src/uicommon/gftpui.c:922
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: src/uicommon/gftpui.c:923
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr "Postavlja način rada prijenosa trenutne datoteke na ASCII (samo za FTP)"
+msgstr ""
+"Postavlja način rada prijenosa trenutne datoteke na ASCII (samo za FTP)"
 
-#: src/uicommon/gftpui.c:924
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binarno"
 
-#: src/uicommon/gftpui.c:925
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr "Postavlja način rada prijenosa trenutne datoteke na \"binarno\" (samo za FTP)"
+msgstr ""
+"Postavlja način rada prijenosa trenutne datoteke na \"binarno\" (samo za FTP)"
 
-#: src/uicommon/gftpui.c:926
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: src/uicommon/gftpui.c:927 src/uicommon/gftpui.c:929
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Mijenjanje udaljenog radnog direktorija"
 
-#: src/uicommon/gftpui.c:928
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: src/uicommon/gftpui.c:930
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: src/uicommon/gftpui.c:931
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Mijenjanje dozvola nad udaljenom datotekom"
 
-#: src/uicommon/gftpui.c:932
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "očisti"
 
-#: src/uicommon/gftpui.c:933
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Dostupne mogućnosti: međuspremnik"
 
-#: src/uicommon/gftpui.c:934
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "zatvori"
 
-#: src/uicommon/gftpui.c:935
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Prekidanje povezivanja s udaljenim mjestom"
 
-#: src/uicommon/gftpui.c:936
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "briši"
 
-#: src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Uklanja udaljenu datoteku"
 
-#: src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "Prikazuje popis direktorija trenutnog udaljenog direktorija"
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "dati"
 
-#: src/uicommon/gftpui.c:939 src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Preuzimanje udaljenih datoteka"
 
-#: src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "pomoć"
 
-#: src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Prikazuje ovaj prozor pomoći"
 
-#: src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: src/uicommon/gftpui.c:943 src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Mijenjanje lokalnog radnog direktorija"
 
-#: src/uicommon/gftpui.c:944
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Mijenjanje dozvola nad lokalnom datoteke"
 
-#: src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Uklanja lokalnu datoteku"
 
-#: src/uicommon/gftpui.c:950
-msgid "lls"
-msgstr "lls"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
 
-#: src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Prikazuje popis direktorija trenutnog lokalnog direktorija"
 
-#: src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Stvaranje lokalnog direktorija"
 
-#: src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Prikazuje trenutni lokalni direktorij"
 
-#: src/uicommon/gftpui.c:956
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Preimenuje lokalnu datoteku"
 
-#: src/uicommon/gftpui.c:958
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Uklanja lokalni direktorij"
 
-#: src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: src/uicommon/gftpui.c:961
-msgid "Shows the directory listing for the current remote directory"
-msgstr "Prikazuje popis direktorija trenutnog udaljenog direktorija"
-
-#: src/uicommon/gftpui.c:962
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Stvaranje udaljenog direktorija"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: src/uicommon/gftpui.c:967 src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Šalje lokalnu datoteku(e)"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Otvara vezu s udaljenim mjestom"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "ugasiti"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Prikazuje trenutni udaljeni direktorij"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Izlaz iz gFTP-a"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "promijeni ime"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Preimenuje udaljenu datoteku"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Uklanja udaljeni direktorij"
 
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "skup"
 
-#: src/uicommon/gftpui.c:981
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr """Prikazuje varijable iz datoteke s postavkama. Možete postaviti "
-"varijable i pomoću set varijabla=vrijednost"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"Prikazuje varijable iz datoteke s postavkama. Možete postaviti varijable i "
+"pomoću set varijabla=vrijednost"
 
-#: src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "web stranica"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Pokrenite naredbe specifične za to računalo"
 
-#: src/uicommon/gftpui.c:1074
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Greška: Naredba nije prepoznata\n"
 
-#: src/uicommon/gftpui.c:1324
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr """Greška: Udaljeno mjesto je prekinulo vezu nakon pokušaja prijenosa "
-"datoteke\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Uspješno preneseno %s na %.2f KB/s\n"
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Preskačem datoteku %s na računalu %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Zaustavljam prijenos na računalu %s\n"
 
-#: src/uicommon/gftpui.c:1393
+#: src/uicommon/gftpui.c:1505
+#, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Ne mogu preuzeti %s s %s\n"
 
-#: src/uicommon/gftpui.c:1416
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Uspješno preneseno %s na %.2f KB/s\n"
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:40 src/gtk/gftp-gtk.c:200 src/gtk/gftp-gtk.c:1015
-#: src/gtk/misc-gtk.c:478 src/gtk/misc-gtk.c:486
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
-msgstr "%s: Molim prvo pritisnite stop gumb  da bi mogli raditi bilo što druho\n"
+msgstr ""
+"%s: Molim prvo pritisnite stop gumb  da bi mogli raditi bilo što druho\n"
 
 #: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
@@ -1654,6 +1896,7 @@ msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Dodaj knjižnu oznaku: Morate unesti ime za knjižnu oznaku\n"
 
 #: src/gtk/bookmarks.c:78
+#, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "Dodaj knjižnu oznaku: Ne mogu označiti %s jer to ime već potoji \n"
 
@@ -1679,130 +1922,135 @@ msgstr ""
 msgid "Remember password"
 msgstr "Zapamti lozinku"
 
-#: src/gtk/bookmarks.c:473 src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Dodaj knjižnu oznaku: Morate unesti ime za knjižnu oznaku\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nova mapa"
 
-#: src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Unesite ime nove mape koju želite napraviti"
 
-#: src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Datoteka/Nova stavka..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Unesite ime nove stavke koju želite napraviti"
 
-#: src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Jeste li sigurni da želite obrisati bilješku\n"
 "%s i svu njezinu djecu?"
 
-#: src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Obriši knjišku oznaku"
 
-#: src/gtk/bookmarks.c:585
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bilješke"
 
-#: src/gtk/bookmarks.c:846 src/gtk/bookmarks.c:849
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Uređivanje zapisa"
 
-#: src/gtk/bookmarks.c:887
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/gtk/bookmarks.c:902
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Ime računala:"
 
-#: src/gtk/bookmarks.c:915
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gtk/bookmarks.c:932
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtk/bookmarks.c:956
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Udaljeni direktorij:"
 
-#: src/gtk/bookmarks.c:969
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokalni direktorij:"
 
-#: src/gtk/bookmarks.c:986
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: src/gtk/bookmarks.c:999 src/text/textui.c:82
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/gtk/bookmarks.c:1013
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Račun:"
 
-#: src/gtk/bookmarks.c:1027
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Prijavi se kao ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1052 src/gtk/bookmarks.c:1296
-#: src/gtk/chmod_dialog.c:293 src/gtk/gtkui_transfer.c:373
-#: src/gtk/options_dialog.c:1120 src/gtk/options_dialog.c:1322
-msgid "  Cancel  "
-msgstr "Otkazati"
-
-#: src/gtk/bookmarks.c:1062 src/gtk/options_dialog.c:1333
-msgid "Apply"
-msgstr "Primijeni"
-
-#: src/gtk/bookmarks.c:1212
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/gtk/bookmarks.c:1213
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Datoteka/tearoff"
 
-#: src/gtk/bookmarks.c:1214
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Datoteka/Nova mapa..."
 
-#: src/gtk/bookmarks.c:1215
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Datoteka/Nova stavka..."
 
-#: src/gtk/bookmarks.c:1216
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Datoteka/Obriši"
 
-#: src/gtk/bookmarks.c:1217
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Datoteka/Osobine..."
 
-#: src/gtk/bookmarks.c:1218
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Datoteka/sep"
 
-#: src/gtk/bookmarks.c:1219
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Datoteka/Zatvori"
 
-#: src/gtk/bookmarks.c:1230 src/gtk/bookmarks.c:1233
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Uredi bilješke"
 
-#: src/gtk/chmod_dialog.c:160 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1810,75 +2058,93 @@ msgstr ""
 "Sada možete podesiti atribute vaših datoteka\n"
 "Napomena: Svi ftp poslužitelji ne podržavaju chmod"
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Posebno"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Ljepljiv"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:699
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Korisnik"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Čitaj"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Zapisivanje"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:700
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupa"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
+#, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
-msgstr """Jeste li sigurni da želite obrisati ovih %ld datoteka(e) i %ld "
-"direktorij(a)"
+msgstr ""
+"Jeste li sigurni da želite obrisati ovih %ld datoteka(e) i %ld direktorij(a)"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+"Jeste li sigurni da želite obrisati ovih %ld datoteka(e) i %ld direktorij(a)"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+"Jeste li sigurni da želite obrisati ovih %ld datoteka(e) i %ld direktorij(a)"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Obriši datoteke/direktorije"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1194
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gtk/dnd.c:146 src/gtk/dnd.c:233
-msgid "Drag-N-Drop"
-msgstr "Povuci-i-ispusti"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Spoji"
 
-#: src/gtk/dnd.c:255
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
+#, c-format
 msgid "Received URL %s\n"
 msgstr "Primljen URL %s\n"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "Povuci-i-ispusti"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1886,464 +2152,511 @@ msgstr ""
 "Neki prenosi su u toku.\n"
 "Jeste li sigurni da želite izaći?"
 
-#: src/gtk/gftp-gtk.c:185
-msgid "Connect via URL"
-msgstr "Poveži se koristeći URL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Odrednice"
 
-#: src/gtk/gftp-gtk.c:185
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Upišite URL za spajanje"
 
-#: src/gtk/gftp-gtk.c:201
-msgid "OpenURL"
-msgstr "Otvori URL"
-
-#: src/gtk/gftp-gtk.c:224
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:225
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: src/gtk/gftp-gtk.c:226
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Prozor 1"
 
-#: src/gtk/gftp-gtk.c:227
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Prozor 2"
 
-#: src/gtk/gftp-gtk.c:228 src/gtk/gftp-gtk.c:231 src/gtk/gftp-gtk.c:234
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: src/gtk/gftp-gtk.c:230
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binarno"
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Odrednice..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Datoteka/Osobine..."
 
-#: src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Izađi"
 
-#: src/gtk/gftp-gtk.c:236
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokalno"
 
-#: src/gtk/gftp-gtk.c:237
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokalno/tearoff"
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokalno/Otvori _URL..."
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokalno/Prekini vezu"
 
-#: src/gtk/gftp-gtk.c:240 src/gtk/gftp-gtk.c:246
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokalno/sep"
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokalno/Promijeni osobine datoteka..."
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokalno/Pokaži označeno"
 
-#: src/gtk/gftp-gtk.c:243
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokalno/Označi sve"
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokalno/Označi sve datoteke"
 
-#: src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokalno/Ukloni cijeli odabir"
 
-#: src/gtk/gftp-gtk.c:247
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalno/Spremi popis direktorija..."
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalno/Pošalji naredbu \"SITE\"..."
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokalno/Promijeni direktorij"
 
-#: src/gtk/gftp-gtk.c:250
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Lokalno/Chmod..."
 
-#: src/gtk/gftp-gtk.c:251
-msgid "/Local/Make Directory..."
-msgstr "/Lokalno/Napravi direktorij..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Datoteka/Nova mapa..."
 
-#: src/gtk/gftp-gtk.c:252
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Lokalno/Preimenuj..."
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Lokalno/Obriši..."
 
-#: src/gtk/gftp-gtk.c:254
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Lokalno/Uredi..."
 
-#: src/gtk/gftp-gtk.c:255
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Lokalno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:256
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Lokalno/Osvježi"
 
-#: src/gtk/gftp-gtk.c:257
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Udaljeno"
 
-#: src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Udaljeno/tearoff"
 
-#: src/gtk/gftp-gtk.c:259
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Udaljeno/Otvori _URL.."
 
-#: src/gtk/gftp-gtk.c:261
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Udaljeno/Prekini povezivanje"
 
-#: src/gtk/gftp-gtk.c:263 src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Udaljeno/sep"
 
-#: src/gtk/gftp-gtk.c:264
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Udaljeno/Promijeni osobine datoteka..."
 
-#: src/gtk/gftp-gtk.c:265
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Udaljeno/Pokaži označene"
 
-#: src/gtk/gftp-gtk.c:266
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Udaljeno/Označi sve"
 
-#: src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Udaljeno/Označi sve datoteke"
 
-#: src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Udaljeno/Ukloni cijeli odabir"
 
-#: src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Udaljeno/Spremi popis direktorija..."
 
-#: src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Udaljeno/Pošalji naredbu \"SITE\"..."
 
-#: src/gtk/gftp-gtk.c:272
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Udaljeno/Promijeni direktorij"
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Udaljeno/Chmod..."
 
-#: src/gtk/gftp-gtk.c:274
-msgid "/Remote/Make Directory..."
-msgstr "/Udaljeno/Napravi direktorij"
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Datoteka/Nova mapa..."
 
-#: src/gtk/gftp-gtk.c:275
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Udaljeno/Preimenuj"
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Udaljeno/Obriši"
 
-#: src/gtk/gftp-gtk.c:277
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Udaljeno/Uredi..."
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Udaljeno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:279
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Udaljeno/Osvježi"
 
-#: src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bilješke"
 
-#: src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Knjižne oznake/otkini"
 
-#: src/gtk/gftp-gtk.c:282
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Knjižne oznake/Dodaj knjižnu oznaku"
 
-#: src/gtk/gftp-gtk.c:284
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Knjižne oznake/Uredi knjižne oznake"
 
-#: src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bilješke/sep"
 
-#: src/gtk/gftp-gtk.c:286
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Prenosi"
 
-#: src/gtk/gftp-gtk.c:287
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Prijenosi/tearoff"
 
-#: src/gtk/gftp-gtk.c:288
-msgid "/Transfers/Start Transfer"
-msgstr "/Prijenosi/Pokreni prijenos"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Prijenosi/tearoff"
 
-#: src/gtk/gftp-gtk.c:289
-msgid "/Transfers/Stop Transfer"
-msgstr "/Prijenosi/Zaustavi prijenos"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Prijenosi/sep"
 
-#: src/gtk/gftp-gtk.c:291 src/gtk/gftp-gtk.c:299
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Prijenosi/sep"
 
-#: src/gtk/gftp-gtk.c:292
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Prijenosi/Preskoči trenutnu datoteku"
 
-#: src/gtk/gftp-gtk.c:293
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Prijenosi/Ukloni datoteku"
 
-#: src/gtk/gftp-gtk.c:295
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Prijenosi/Premjesti datoteku _naviše"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Prijenosi/Premjesti datoteku nani_že"
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Prijenosi/Preuzmi datoteke"
 
-#: src/gtk/gftp-gtk.c:301
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Prijenosi/Pošalji datoteke"
 
-#: src/gtk/gftp-gtk.c:302
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/_Dnevnik"
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Dnevnik/tearoff"
 
-#: src/gtk/gftp-gtk.c:304
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Dnevnik/Očisti"
 
-#: src/gtk/gftp-gtk.c:305
-msgid "/Logging/View log..."
-msgstr "/Dnevnik/Pregledaj dnevnik..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Lokalno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:306
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Dnevnik/Snimi dnevnik..."
 
-#: src/gtk/gftp-gtk.c:307
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Al_ati"
 
-#: src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Alati/tearoff"
 
-#: src/gtk/gftp-gtk.c:309
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Alati/Usporedi prozore"
 
-#: src/gtk/gftp-gtk.c:310
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Alati/Očisti međuspremnik"
 
-#: src/gtk/gftp-gtk.c:311
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Pomoć"
 
-#: src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Pomoć/tearoff"
 
-#: src/gtk/gftp-gtk.c:313
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Pomoć/O..."
 
-#: src/gtk/gftp-gtk.c:431
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Računalo:"
 
-#: src/gtk/gftp-gtk.c:449
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: src/gtk/gftp-gtk.c:467
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Korisnik:"
 
-#: src/gtk/gftp-gtk.c:485
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Lozinka:"
 
-#: src/gtk/gftp-gtk.c:554
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Naredba:"
 
-#: src/gtk/gftp-gtk.c:697 src/gtk/gftp-gtk.c:904 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: src/gtk/gftp-gtk.c:698
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Veličina"
 
-#: src/gtk/gftp-gtk.c:701
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: src/gtk/gftp-gtk.c:702
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributi"
 
-#: src/gtk/gftp-gtk.c:905
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Napredak"
 
-#: src/gtk/gftp-gtk.c:1016 src/gtk/misc-gtk.c:905 src/gtk/misc-gtk.c:979
-msgid "Connect"
-msgstr "Spoji"
-
-#: src/gtk/gftp-gtk.c:1046
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Greška: Morate unijeti računalo na koje se želite spojiti\n"
 
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: src/gtk/gtkui.c:93
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Unesite korisničko ime:"
 
-#: src/gtk/gtkui.c:94
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Molim, upišite svoje korisničko ime za ovo računalo"
 
-#: src/gtk/gtkui.c:115 src/gtk/transfer.c:508 src/gtk/transfer.c:519
-msgid "Enter Password"
-msgstr "Upišite šifru"
-
-#: src/gtk/gtkui.c:116 src/gtk/transfer.c:509 src/gtk/transfer.c:520
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Molim unesite lozinku za ovo mjesto"
 
-#: src/gtk/gtkui.c:272
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Postuipak je prekinut...Morate upisati znak\n"
 
-#: src/gtk/gtkui.c:310
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Pravljenje direktorija"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Unesite naziv direktorija koji želite napraviti"
 
-#: src/gtk/gtkui.c:336 src/gtk/gtkui.c:348 src/gtk/misc-gtk.c:908
-#: src/gtk/misc-gtk.c:982
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/gtk/gtkui.c:346
+#: src/gtk/gtkui.c:368
+#, c-format
 msgid "What would you like to rename %s to?"
 msgstr "U što želite preimenovati %s?"
 
-#: src/gtk/gtkui.c:368 src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Stranica"
 
-#: src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Unesite naredbu vezanu uz ovu stranicu"
 
-#: src/gtk/gtkui.c:409 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr ""
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:403 src/gtk/transfer.c:486
-#: src/gtk/transfer.c:964
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Preskočeno"
 
-#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:465 src/gtk/transfer.c:490
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:299
-#: src/gtk/gtkui_transfer.c:326
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Prebriši"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:305
-#: src/gtk/gtkui_transfer.c:332
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Nastavi"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:302
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Preskoči"
 
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Akcija"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:92
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Prijenos datoteka"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2351,56 +2664,62 @@ msgstr ""
 "Sljedeće datoteke postoje i na lokalnom i na udaljenom računalu\n"
 "Molim vas odaberite što želite učiniti"
 
-#: src/gtk/gtkui_transfer.c:308
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Greška"
 
-#: src/gtk/gtkui_transfer.c:338
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Preskoči datoteku"
 
-#: src/gtk/gtkui_transfer.c:348
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Odaberi sve"
 
-#: src/gtk/gtkui_transfer.c:354
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Ukloni cijeli odabir"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Promjena osobine datoteka: Operacija je otkazana...morate unijeti znakovni niz\n"
+msgstr ""
+"Promjena osobine datoteka: Operacija je otkazana...morate unijeti znakovni "
+"niz\n"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Promijena osobine datoteka"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Unesite novu specifikaciju datoteke"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:371
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Greška: Ne mogu otvoriti %s za pisanje: %s\n"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Spremi popis direktorija"
 
-#: src/gtk/menu-items.c:337 src/gtk/menu-items.c:395
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
+#, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Greška: Greška prilikom upisa u %s: %s\n"
 
-#: src/gtk/menu-items.c:406
+#: src/gtk/menu-items.c:382
+#, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Uspješno sam zapisao datoteku dnevnika %s\n"
 
-#: src/gtk/menu-items.c:418
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Spremi dnevnik"
 
-#: src/gtk/menu-items.c:454
+#: src/gtk/menu-items.c:428
+#, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
@@ -2408,104 +2727,96 @@ msgstr ""
 "Ne mogu pronaći datoteku ugovora o licenciranju COPYING. Molim vas uvjerite "
 "se da se ona nalazi u %s ili u %s"
 
-#: src/gtk/menu-items.c:458 src/gtk/menu-items.c:463
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "O gFTP-u"
 
-#: src/gtk/menu-items.c:494
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Sluzbena web stranica: http://www.gftp.org/\n";
 "Logo kreirao: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:506
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "O"
 
-#: src/gtk/menu-items.c:555
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licencni dogovor"
 
-#: src/gtk/menu-items.c:561 src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr "Zatvori"
-
-#: src/gtk/menu-items.c:643
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Usporedi prozore"
 
-#: src/gtk/misc-gtk.c:287
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "Prekidanje povezivanja s udaljenim mjestom"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: src/gtk/misc-gtk.c:294
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (u međuspremniku) ["
 
-#: src/gtk/misc-gtk.c:319
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nije povezan"
 
-#: src/gtk/misc-gtk.c:405
+#: src/gtk/misc-gtk.c:383
+#, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Greška prilikom otvaranja datoteke %s: %s\n"
 
-#: src/gtk/misc-gtk.c:494
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Nije spojem na udaljenim siteom\n"
 
-#: src/gtk/misc-gtk.c:501
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Ovo svojstvo nije dostupno koristeći ovaj protokol\n"
 
-#: src/gtk/misc-gtk.c:509
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Morate imati samo jedan predmet odabran\n"
 
-#: src/gtk/misc-gtk.c:516
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Morate imati barem jedan predmet odabran\n"
 
-#: src/gtk/misc-gtk.c:902 src/gtk/misc-gtk.c:976
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Promijeni"
 
-#: src/gtk/misc-gtk.c:973 src/gtk/options_dialog.c:1180
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/gtk/misc-gtk.c:999
-msgid "Cancel"
-msgstr "Odustani"
-
-#: src/gtk/misc-gtk.c:1069
-msgid "  Yes  "
-msgstr "Da "
-
-#: src/gtk/misc-gtk.c:1079
-msgid "  No  "
-msgstr "Ne"
-
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Dohvaćam popise direktorija"
 
-#: src/gtk/misc-gtk.c:1159
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "Stani"
 
-#: src/gtk/misc-gtk.c:1169
+#: src/gtk/misc-gtk.c:1003
+#, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
@@ -2513,39 +2824,51 @@ msgstr ""
 "Primljeno %ld direktorij(a)\n"
 "i %ld datoteka(e)"
 
-#: src/gtk/misc-gtk.c:1243
+#: src/gtk/misc-gtk.c:1079
+#, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Greška gFTP-a: Ne mogu pronaći datoteku %s u %s ili %s\n"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "&Izvezi popis..."
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Dodaj korisnika"
 
-#: src/gtk/options_dialog.c:952 src/gtk/options_dialog.c:1043
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domena"
 
-#: src/gtk/options_dialog.c:972
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "Adresa mreže"
 
-#: src/gtk/options_dialog.c:1005 src/gtk/options_dialog.c:1145
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Mrežna maska"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Domena"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: src/gtk/options_dialog.c:1151
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokalni računalo"
 
-#: src/gtk/options_dialog.c:1187 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Uređivanje"
-
-#: src/gtk/options_dialog.c:1249 src/gtk/options_dialog.c:1254
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Odrednice"
 
@@ -2553,31 +2876,41 @@ msgstr "Odrednice"
 msgid "Receiving file names..."
 msgstr "Primam imena datoteka..."
 
-#: src/gtk/transfer.c:62 src/gtk/transfer.c:639
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gtk/transfer.c:100
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Preuzimanje datoteka: Nisam povezan s udaljenim mjestom\n"
 
-#: src/gtk/transfer.c:315
+#: src/gtk/transfer.c:336
+#, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Greška: Dijete %d je vratilo %d\n"
 
-#: src/gtk/transfer.c:318
+#: src/gtk/transfer.c:345
+#, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Dijete %d se uspješno vratilo\n"
 
-#: src/gtk/transfer.c:325
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Greška: Dijete %d je vratilo %d\n"
+
+#: src/gtk/transfer.c:368
+#, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Greška: Ne mogu dohvatiti informacije o datoteci %s: %s\n"
 
-#: src/gtk/transfer.c:330
+#: src/gtk/transfer.c:374
+#, c-format
 msgid "File %s was not changed\n"
 msgstr "Datoteka %s nije promijenjena\n"
 
-#: src/gtk/transfer.c:338
+#: src/gtk/transfer.c:382
+#, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
@@ -2585,100 +2918,234 @@ msgstr ""
 "Datoteka %s je promijenjena.\n"
 "Želite li je poslati?"
 
-#: src/gtk/transfer.c:341
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Uređivanje datoteke"
 
-#: src/gtk/transfer.c:406
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Završeno"
 
-#: src/gtk/transfer.c:446
-msgid "Stopping the transfer of %s\n"
-msgstr "Zaustavljanje prijenosa %s\n"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr ""
+"Primljeno %s od %s pri %.2fKB/s, %02d:%02d:%02d je procijena preostalog "
+"vremena"
 
-#: src/gtk/transfer.c:683
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% zavrseno, %02d:%02d:%02d procijenjeno preostalo vrijeme. (Datoteka %ld od %ld)"
-
-#: src/gtk/transfer.c:713
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "Primljeno %s od %s pri %.2fKB/s, %02d:%02d:%02d je procijena preostalog vremena"
+msgstr ""
+"Primljeno %s od %s pri %.2fKB/s, %02d:%02d:%02d je procijena preostalog "
+"vremena"
 
-#: src/gtk/transfer.c:722
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Primljeno %s od %s, prijenos je zastao, nepoznato vrijeme završetka"
+
+#: src/gtk/transfer.c:756
+#, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Primljeno %s od %s, prijenos je zastao, nepoznato vrijeme završetka"
 
-#: src/gtk/transfer.c:757
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
+
+#: src/gtk/transfer.c:804
+#, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr ""
+"%d%% zavrseno, %02d:%02d:%02d procijenjeno preostalo vrijeme. (Datoteka %ld "
+"od %ld)"
+
+#: src/gtk/transfer.c:842
+#, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Dohvaćam imena datoteka...%s bajtova"
 
-#: src/gtk/transfer.c:836 src/gtk/transfer.c:858 src/gtk/transfer.c:892
-#: src/gtk/transfer.c:932 src/gtk/transfer.c:985 src/gtk/transfer.c:1045
+#: 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 "Nema odabranih prijenosa datoteka\n"
 
-#: src/gtk/transfer.c:876
-msgid "Stopping the transfer on host %s\n"
-msgstr "Zaustavljam prijenos na računalu %s\n"
-
-#: src/gtk/transfer.c:917 src/gtk/transfer.c:970
-msgid "Skipping file %s on host %s\n"
-msgstr "Preskačem datoteku %s na računalu %s\n"
-
-#: src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Pogled"
 
-#: src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Uređivanje"
+
+#: src/gtk/view_dialog.c:49
+#, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Pregled: %s je direktorij. Ne mogu ga pregledavati.\n"
 
-#: src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Uređivanje: Morate navesti uređivač u dijalogu s odrednicama\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 "Uređivanje: %s je direktorij. Ne mogu ga uređivati.\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 "Uređivanje: Morate navesti uređivač u dijalogu s odrednicama\n"
+
+#: src/gtk/view_dialog.c:177
+#, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Pregled: Ne mogu forkati proces: %s\n"
 
-#: src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
+#, c-format
 msgid "Running program: %s %s\n"
 msgstr "Pokrećem program: %s %s\n"
 
-#: src/gtk/view_dialog.c:271
+#: src/gtk/view_dialog.c:238
+#, c-format
 msgid "Opening %s with %s\n"
 msgstr "Otvaram %s preko %s\n"
 
-#: src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
+#, c-format
 msgid "Viewing file %s\n"
 msgstr "Pregledavam datoteku %s\n"
 
-#: src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
+#, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Pregled: Ne mogu otvoriti datoteku %s: %s\n"
 
-#: src/text/gftp-text.c:169
+#: src/text/gftp-text.c:166
+#, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Ne mogu otvoriti upravljački terminal %s\n"
 
-#: src/text/textui.c:70
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Korisničko ime [anonymous]:"
 
-#: src/text/textui.c:139
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "Već postoji %s. (%s veličina izvora, %s veličina odredišta):\n"
-"(o)prepiši, (r)nastavi, (s)preskoči, (O)prepiši sve, (R)nastavi sve, "
-"(S)preskoći sve: (%c)"
+"(o)prepiši, (r)nastavi, (s)preskoči, (O)prepiši sve, (R)nastavi sve, (S)"
+"preskoći sve: (%c)"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Početni direktorij:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Uobičajeni direktorij u kome će gFTP biti pri pokretanju"
+
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Pokrećem prijenos datoteke s pomakom %lld\n"
+
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "SSH2 sftp-poslužitelj putanja:"
+
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "Uobičajena putanja udaljenog SSH2 sftp poslužitelja"
+
+#~ msgid "Use ssh-askpass utility"
+#~ msgstr "Koristi alat ssh-askpass"
+
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "Koristi ssh-askpass alat za pribavljanje lozinke korisnika"
+
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "Koristi podsustav SSH2 - SFTP"
+
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "Pozovite s ssh -s zastavicom. Ovo je korisno jer ne morate znati putanju "
+#~ "do udaljenog sftp poslužitelja"
+
+#~ msgid "WARNING"
+#~ msgstr "UPOZORENJE"
+
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "Molim spojite se na ovo ačunalo koristeći program SSH iz naredbne linije "
+#~ "i prikladno odgovorite na ovo pitanje.\n"
+
+#~ msgid "Please correct the above warning to connect to this host.\n"
+#~ msgstr ""
+#~ "Molim vas da ispravite gornje upozorenje kako biste se povezali s ovim "
+#~ "računalom.\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 ""
+#~ ">. Ako imate pitanja, komentare, ili prijedloge za ovaj program, slobodno "
+#~ "mi ih pošaljite e-poštom. Najnovije vijesti o gFTP-u uvijek možete "
+#~ "saznati na mojoj web stanici  na adresi http://www.gftp.org/\n";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Greška: Udaljeno mjesto je prekinulo vezu nakon pokušaja prijenosa "
+#~ "datoteke\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "Otkazati"
+
+#~ msgid "Apply"
+#~ msgstr "Primijeni"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Poveži se koristeći URL"
+
+#~ msgid "OpenURL"
+#~ msgstr "Otvori URL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Odrednice..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Lokalno/Napravi direktorij..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Udaljeno/Napravi direktorij"
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Prijenosi/Pokreni prijenos"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Prijenosi/Zaustavi prijenos"
+
+#~ msgid "/Logging/View log..."
+#~ msgstr "/Dnevnik/Pregledaj dnevnik..."
+
+#~ msgid "  Close  "
+#~ msgstr "Zatvori"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "  Yes  "
+#~ msgstr "Da "
+
+#~ msgid "  No  "
+#~ msgstr "Ne"
 
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Zaustavljanje prijenosa %s\n"
diff --git a/po/hu.po b/po/hu.po
index 4df1ba7..b308cb9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,53 +10,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-20 11:56+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2013-01-01 15:52+0100\n"
 "Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"Language: hu\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Érvénytelen URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Hiba: Érvénytelen sor a gyorsítótár indexfájljában: %s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Hiba: Nem lehet létrehozni a(z) %s könyvtárat: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Hiba: Nem lehet létrehozni átmeneti fájlt: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Hiba a fájlleíró lezárása közben: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Hiba: Nem lehet pozicionálni a(z) %s fájlban: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -64,48 +62,48 @@ msgstr ""
 "Hiba a(z) '%s' karakterlánc %s karakterkészletből %s karakterkészletbe "
 "konvertálása közben: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Hiba: Nem lehet megnyitni a(z) %s helyi fájlt: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Hiba: Nem lehet írni a foglalatba: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Hiba: Nem lehet olvasni a foglalatból: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Hiba: Rossz könyvjelzőfájlnév: %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Figyelmeztetés: A fő könyvjelzőfájl nem található: %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP Hiba: Nem lehet megnyitni a(z) %s könyvjelzőfájlt: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Figyelmeztetés: Könyvjelzőfájl %d. sorának mellőzése: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Figyelmeztetés: %d. sornak nincs elég paramétere\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -115,7 +113,7 @@ msgstr ""
 "a proxy az eléréséhez (ha létezik). Formátum: dont_use_proxy=domain vagy "
 "dont_use_proxy=hálózati szám/hálózati maszk"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -123,53 +121,53 @@ msgstr ""
 "ext=fájlkiterjesztés:XPM-fájl:ASCII vagy bináris (A v. B):nézőprogram. "
 "Megjegyzés: Minden paraméter opcionális, kivéve a fájlkiterjesztés."
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Hiba: Rossz konfigurációsfájl-név: %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP Hiba: Nem lehet létrehozni a(z) %s könyvtárat: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP Hiba: A fő konfigurációs fájl nem található: %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Kiadta a „make install” parancsot?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP Hiba: A(z) %s konfigurációs fájl megnyitása sikertelen: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Felfüggesztés a konfigurációs fájl %d. sorában lévő értelmezési hibák miatt\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP Figyelmeztetés: Konfigurációs fájl %d sorának mellőzése: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP Hiba: Rossz naplófájlnév: %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Figyelmeztetés: %s fájl írásra megnyitása sikertelen: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -178,7 +176,7 @@ msgstr ""
 "Figyelmeztetés: Bármilyen megjegyzést ad ehhez a fájlhoz, az felülírásra "
 "kerül."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -190,7 +188,7 @@ msgstr ""
 "ne olvashassa el a jelszavát senki, aki szintén a monitort nézi. Ezelőtt a "
 "minden jelszó sima szövegként volt tárolva."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -201,96 +199,95 @@ msgstr ""
 "kerül. Ha egy bejegyzésnek (*) van a megjegyzésében, akkor az a gFTP-n belül "
 "nem változtatható."
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ismeretlen>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "VÉGZETES gFTP hiba: '%s' konfigurációs opció nem található a globális hash "
 "táblában\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Hiba: Nem lehet feltölteni a(z) %s fájlt\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Hiba: Nem lehet írni a(z) %s fájlba: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Hiba: Hiba a fájl lezárása közben: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Sérült fájllistázás a(z) %s FSP-kiszolgálótól\n"
 
-#: ../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
+#: 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 "ismeretlen"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nem lehet lekérdezni a(z) %s FSP-könyvtárlistát: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Sikeres könyvtárváltás a(z) %s könyvtárba\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nem lehet a(z) %s könyvtárba váltani\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s sikeresen eltávolítva\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Hiba: %s könyvtár eltávolítása sikertelen: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Hiba: %s fájl eltávolítása sikertelen: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "%s könyvtár sikeresen létrehozva\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s sikeresen átnevezve, új név: %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Hiba: %s -> %s átnevezés sikertelen: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -298,7 +295,7 @@ msgstr ""
 "FTPS támogatás nem érhető el, mivel az SSL támogatás nem lett belefordítva a "
 "programba. Kapcsolat megszakítása.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -306,107 +303,105 @@ msgstr ""
 "HTTPS támogatás nem érhető el, mivel az SSL támogatás nem lett belefordítva "
 "a programba. Kapcsolat megszakítása.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nem lehet lekérdezni a jelenlegi munkakönyvtárat: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Sikeres könyvtárváltás a(z) %s helyi könyvtárba\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Nem lehet a(z) %s helyi könyvtárba váltani: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Hiba: %s helyi fájl csonkítása sikertelen: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nem lehet lekérdezni a(z) %s helyi könyvtárlistát: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s módjának megváltoztatása sikeres, új mód: %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Hiba: %s módjának beállítása (%o) sikertelen: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "A(z) %s időbélyegének módosítása sikeres\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Hiba: %s időbélyegének beállítása sikertelen: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "helyi fájlrendszer"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "használat: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nincs"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fájl"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "méret"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "felhasználó"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "csoport"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "idő"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attribútumok"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "csökkenő"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "növekvő"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Általános"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Nézőprogram:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -414,27 +409,27 @@ msgstr ""
 "Az alapértelmezett program a fájlok megnézéséhez. Ha ez üres, akkor a belső "
 "néző lesz használva."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Szerkesztőprogram:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Az alapértelmezett program a fájlok szerkesztéséhez."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maximális naplóablakméret:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "A naplóablak maximális mérete bájtban a GTK+ portoláshoz"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Távoli karakterkészletek:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -442,11 +437,11 @@ msgstr ""
 "Ez azon karakterkészletek vesszőkkel elválasztott listája, amelyekkel a gFTP "
 "megpróbálja a távoli üzeneteket helyi kódolásúvá alakítani"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Távoli LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -454,196 +449,190 @@ msgstr ""
 "Az LC_TIME értéke a távoli gépen. Így a dátumok megfelelően dolgozhatóak fel "
 "könyvtárak listázásakor."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Gyorsítótár TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "A gyorsítótár-bejegyzések megtartása ennyi másodpercig mielőtt azok lejárnak."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Fájlátvitel hozzáfűzése"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Új fájlátvitelek hozzáfűzése a már meglévőkhöz"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Egyszerre egy átvitel"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Egyszerre csak egy átvitel?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Felülírás alapértelmezésként"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Alapértelmezettként a fájlok felülírása, vagy az átvitel folytatása"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Jogosultságok megőrzése"
 
-#: ../lib/options.h:80
-#| msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
 msgid "Preserve file permissions of transferred files"
 msgstr "Az átvitt fájlok jogosultságainak megőrzése"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Fájl idejének megőrzése"
 
-#: ../lib/options.h:85
-#| msgid "Preserve file times of transfered files"
+#: lib/options.h:85
 msgid "Preserve file times of transferred files"
 msgstr "Az átvitt fájlok idejének megőrzése"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Frissítés minden fájlátvitel után"
 
-#: ../lib/options.h:90
-#| msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
 msgid "Refresh the listbox after each file is transferred"
 msgstr "Listamező frissítése minden átvitt fájl után"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Könyvtárak rendezése a lista elejére"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Előbb a könyvtárak, aztán a fájlok felsorolása"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Rejtett fájlok megjelenítése a listamezőkben"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Átvitel állapotának mutatása a címsorban"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Fájlátvitel állapotának mutatása a címsorban"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Fájlátvitel indítása"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Az átvitelek automatikus megkezdése amint bekerülnek a sorba"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Kézi parancsok engedélyezése a GUI-ban"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Kézi parancsbevitel engedélyezése a GUI-ba (a szöveges porthoz hasonlóan "
 "működik)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Emlékezzen az utolsó könyvtárra"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Az utolsó helyi és távoli könyvtár mentése az alkalmazás bezárásakor"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Kapcsolódás a távoli kiszolgálóhoz indításkor"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Automatikus csatlakozás a távoli kiszolgálóhoz az alkalmazás indításakor."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Hálózati időtúllépés:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "A hálózati kimenet/bemenet időtúllépése. Ez NEM egy tétlen időtúllépés."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Kapcsolódási próbálkozások:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Az automatikus újrapróbálkozások száma. Állítsa 0-ra a végtelen számú "
 "próbához"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Két újrapróbálkozás közötti idő:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Két újrapróbálkozás közötti várakozási idő másodpercben"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maximum átviteli sebesség, KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "A maximális KB/s, amit egy fájlátvitel kaphat. (Állítsa 0-ra a korlátlanhoz)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Átviteli blokkméret:"
 
-#: ../lib/options.h:144
-#| msgid ""
-#| "The block size that is used when transfering files. This should be a "
-#| "multiple of 1024."
+#: lib/options.h:144
 msgid ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Fájlok átvitelénél használt blokkméret. Ez 1024 többszöröse kell legyen."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Alapértelmezett protokoll:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ez megadja az alapértelmezettként használandó protokollt"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 támogatás bekapcsolása"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -651,27 +640,27 @@ msgstr ""
 "Ez meghatározza, hogy mi fog történni, ha duplán kattint egy fájlra a fájl "
 "listamezőben. 0=Megtekintés 1=Szerkesztés 2=Átvitel"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "A helyi fájlok listájának alapértelmezett szélessége"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "A távoli fájlok listájának alapértelmezett szélessége"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "A helyi/távoli fájlok listájának alapértelmezett magassága"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Az átviteli lista alapértelmezett magassága"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "A naplózó ablak alapértelmezett magassága"
 
-#: ../lib/options.h:177
+#: 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."
@@ -679,15 +668,15 @@ msgstr ""
 "A fájlnév oszlop szélessége az átviteli ablakban. Állítsa ezt 0-ra az oszlop "
 "automatikus újraméretezéséhez."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "A rendezés alapjául szolgáló oszlop"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Rendezés növekvő vagy csökkenő sorrendben"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -695,7 +684,7 @@ msgstr ""
 "A fájlnév oszlop szélessége a fájl listamezőkben. Állítsa ezt 0-ra az oszlop "
 "automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -703,7 +692,7 @@ msgstr ""
 "A méret oszlop szélessége a fájl listamezőben. Állítsa ezt 0-ra az oszlop "
 "automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -711,7 +700,7 @@ msgstr ""
 "A felhasználó oszlop szélessége a fájl listamezőben. Állítsa ezt 0-ra az "
 "oszlop automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -719,7 +708,7 @@ msgstr ""
 "A csoport oszlop szélessége a fájl listamezőben. Állítsa ezt 0-ra az oszlop "
 "automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -727,7 +716,7 @@ msgstr ""
 "A dátum oszlop szélessége a fájl listamezőben. Állítsa ezt 0-ra az oszlop "
 "automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -735,77 +724,77 @@ msgstr ""
 "Az attribútumok oszlop szélessége a fájl listamezőben. Állítsa ezt 0-ra az "
 "oszlop automatikus újraméretezéséhez. Állítsa -1-re az oszlop eltüntetéséhez."
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "A kiszolgálónak küldött parancsok színe"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "A kiszolgálótól kapott parancsok színe"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "A hibaüzenetek színe"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "A többi naplóüzenet színe"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Helyi"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Könyvjelző"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "A fájlátvitel %.2f KB/s sebességű lesz\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
-"Hiba az LC_TIME nem állítható be a következőre: %s'. Visszaállítom erre: '%"
-"s'\n"
+"Hiba az LC_TIME nem állítható be a következőre: %s'. Visszaállítom erre: "
+"'%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "%s könyvtárlista betöltése a gyorsítótárból (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "%s könyvtárlista betöltése a kiszolgálóról (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -814,110 +803,110 @@ msgstr ""
 "Figyelmeztetés: A(z) „%s” fájl útvonalának levágása. A levágott útvonal (%s) "
 "nem egyezik a jelenlegi könyvtárral (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Hiba: Nem lehet írni a gyorsítótárba: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Hiba: A könyvjelző nem található: %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Könyvjelzőhiba: A(z) %s könyvjelzőbejegyzés nem tartalmaz gépnevet.\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "A(z) '%s' protokoll nem támogatott.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Rekurzív szimbolikus link: %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Hiba: %s távoli gép szétkapcsolt. Újrapróbálkozások maximális száma elérve. "
 "Feladom!\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Hiba: %s távoli gép szétkapcsolt. %d másodperc múlva újrakapcsolódás\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Hiba: Nem állítható be a „close on exec” jelző: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nem lehet megnyitni a(z) %s fő pty-t: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nem lehet létrehozni a foglalatpárt: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Hiba: Nem lehet végrehajtani az ssh-t: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nem lehet másik folyamatot létrehozni: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy gépneve:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Tűzfal gépneve"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy port:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Tűzfalhoz kapcsolódás portja"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Felhasználónév a proxyhoz:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Felhasználónév a tűzfalhoz"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Jelszó a proxyhoz:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Jelszó a tűzfalhoz"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 használata"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "HTTP/1.1-et vagy HTTP/1.0 szeretne használni?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -926,65 +915,65 @@ msgstr ""
 "Hibás válasz érkezett a kiszolgálótól, szétkapcsolás\n"
 "'%s' érvénytelen darab méret érkezett a távoli kiszolgálótól\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Lekapcsolódás a(z) %s helyről\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Fájlátvitel indítása erről a pozícióról "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s fájl letöltése sikertelen\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Könyvtárlista letöltése...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Hibás válasz érkezett a kiszolgálótól, szétkapcsolás\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE parancs"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "felh gép"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "felh gép:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "felh gép port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "felh gép NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Egyéni"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -992,19 +981,19 @@ msgstr ""
 "Távoli kiszolgálóra névtelen bejelentkezéskor mindig ez a jelszó lesz "
 "használva"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy felhasználói fiók:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "A felhasználói fiókja a tűzfalon (opcionális)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxy-kiszolgáló típusa:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1022,11 +1011,11 @@ msgstr ""
 "(felhasználói fiók). Például a proxy felhasználó megadásához %pu-t kell "
 "beírnia."
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV-cím figyelmen kívül hagyása"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1038,11 +1027,11 @@ msgstr ""
 "Ez gyakran szükséges olyan útválasztóknál, amelyek a külső IP-címük helyett "
 "a belsőt adják meg a PASV-válaszban."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passzív fájlátvitel"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1057,11 +1046,11 @@ msgstr ""
 "használ, ami nem támogatja ezt. Ha ez ki van kapcsolva, a gFTP nyit egy "
 "portot kliensoldalon és a távoli kiszolgáló próbál ehhez kapcsolódni."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Távoli szimbolikus linkek feloldása (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1073,17 +1062,11 @@ msgstr ""
 "egyetlen eset, amikor ezt ki kell kapcsolni, ha a távoli FTP kiszolgáló nem "
 "támogatja a LIST -L opcióját"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Fájlok átvitele ASCII-módban"
 
-#: ../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 text files. If you are transfering from UNIX to UNIX, "
-#| "then it is safe to leave this off. If you are downloading binary data, "
-#| "you will want to disable this."
+#: lib/rfc959.c:87
 msgid ""
 "If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
@@ -1096,337 +1079,328 @@ msgstr ""
 "Unixról Unixra történik az átvitel, ezt nyugodtan kihagyhatja. Ha bináris "
 "adatokat tölt le, kapcsolja ezt ki."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "'%c' érvénytelen válasz érkezett a kiszolgálótól.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Az IPv4 foglalat létrehozása sikertelen: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Nem található IP-cím a(z) '%s' PASV-válaszban\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "IP-cím figyelmen kívül hagyása a PASV-válaszban, kapcsolódás ehhez: %d.%d.%d."
 "%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Adatkapcsolat létrehozása sikertelen: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "A foglalat neve nem szerezhető meg: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Egy port lekötése sikertelen: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "%d porton nem lehet figyelni: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Az IPv6 foglalat létrehozása sikertelen: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Hiba: Nem úgy néz ki, mintha IPv6-on keresztül lennénk csatlakozva. "
 "Kapcsolat megszakítása.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Érvénytelen ESPV válasz: '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "A helyi foglalat címe nem szerezhető meg: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nem lehet elfogadni a kiszolgálótól a kapcsolatot: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "összesen"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Figyelmeztetés: %s lista feldolgozása sikertelen\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "%s kikeresése\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "%s gépnév nem található: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "A foglalat létrehozása sikertelen: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Próba: %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Nem lehet a(z) %s géphez kapcsolódni: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Kapcsolódva: %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Nem lehet kikeresni a szolgáltatásnevet: %s/tcp. Ellenőrizze a "
 "szolgáltatások fájlt\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Kapcsolat a(z) %s géphez sikertelen.\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Foglalat jelzői nem szerezhetőek meg: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Nem lehet beállítani a foglalatot nem-blokkolóra: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH-program neve:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Az SSH bináris útvonala"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH extra paraméterek:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Az SSH programnak átadott extra paraméterek"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH felhasználónév/jelszó kell"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Felhasználónév/jelszó bekérése SSH-kapcsolatokhoz"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "%s program futtatása\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Adja meg az RSA kulcs jelszavát"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Adja meg a jelszót a kulcshoz: '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "jelszó"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(igen/nem)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Adja meg a PASSCODE-ot:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Adja meg a jelszót"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Adja meg a SecurID jelszót:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Hiba: Helytelen jelszót adott meg\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: protokoll inicializálása\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: protokoll verziója %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s megnyitása\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Bezárás\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: %s könyvtár megnyitása\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Könyvtár olvasása\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: %s fájl eltávolítása\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: %s könyvtár létrehozása\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: %s könyvtár eltávolítása\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Valódi út %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Fájl attribútumai\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Nincs ilyen fájl vagy könyvtár"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Sikertelen"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Rossz üzenet"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nincs kapcsolat"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Kapcsolat megszakadt"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Nem támogatott művelet"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Ismeretlen üzenet érkezett vissza a kiszolgálótól"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Hiba: %d üzenetméret túl nagy\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Hiba: %d üzenetméret túl nagy a kiszolgálótól\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1434,41 +1408,41 @@ msgstr ""
 "Hiba lépett fel a távoli kiszolgálóval az SSH kapcsolat inicializálása "
 "közben. A távoli kiszolgáló hibaüzenete a következő:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH-kapcsolat megnyitása a(z) %s gépre\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Sikeres belépés a(z) %s SSH-kiszolgálóra\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-motor"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL-entrópiafájl:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL-entrópiafájl"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entrópia-kezdőérték hossza:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Bájtok maximális száma, amelyek az SSL motor kezdőértékei lesznek"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL fél ellenőrzése"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1481,11 +1455,11 @@ msgstr ""
 "Tárgy = %s\n"
 "Hiba %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "A fél tanúsítványa nem érhető el\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1494,46 +1468,46 @@ msgstr ""
 "HIBA: Az SSL tanúsítványban szereplő kiszolgáló (%s) nem azonos azzal (%s), "
 "amelyhez jelenleg kapcsolódva vagyunk. Kapcsolat megszakítása.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Nem lehet inicializálni az OpenSSL programkönyvtárat\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Hiba az alapértelmezett SSL tanúsítványok betöltésekor\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 "Hiba a titkosítók listájának beállításakor (nincs érvényes titkosító)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Hiba: az SSL-motor nem lett inicializálva\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Hiba az SSL kapcsolat beállításakor (BIO objektum)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Hiba az SSL kapcsolat beállításakor (SSL objektum)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Hiba a fél tanúsítványával: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Művelet megszakítva\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "%d másodperc várakozás az újrapróbálkozás előtt\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1543,73 +1517,73 @@ msgstr ""
 "lásd a COPYING fájlt. Ez egy szabad szoftver, megfelelő feltételek mellett "
 "bármikor továbbíthatja, a részletekért lásd a COPYING fájlt.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Fordította: Doome, Dvornik László, Kelemen Gábor és Tímár András"
 
-#: ../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
+#: 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 "Hiba: Nincs kapcsolat távoli géppel\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "használat: chmod <mód> <fájl>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "használat: rename <régi név> <új név>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "használat: delete <fájl>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "használat: rmdir <könyvtár>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "használat: site <site parancs>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "használat: mkdir <új könyvtár>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "használat: chdir <könyvtár>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Érvénytelen paraméter\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Könyvtár-gyorsítótár törlése\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "használat: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "használat: set [változó = érték]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Hiba: %s változó nem egy érvényes konfigurációs változó.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Hiba: A(z) %s változó nem érhető el a gFTP szöveges változatában.\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1617,287 +1591,287 @@ msgstr ""
 "Támogatott parancsok:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "használat: %s <fájlspec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "A gFTP program névjegye"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "A jelenlegi fájlátviteli módot ASCII-ra állítja (csak FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "A jelenlegi fájlátviteli módot binárisra állítja (csak FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Megváltoztatja a távoli munkakönyvtárat"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Megváltoztatja egy távoli fájl jogait"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "törlés"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Lehetséges beállítások: gyorsítótár"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Lekapcsolódik a távoli gépről"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Eltávolít egy távoli fájlt"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "A jelenlegi távoli könyvtár tartalmának mutatása"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Távoli fájl(ok) letöltése"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "E segítőképernyő mutatása"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Megváltoztatja a helyi munkakönyvtárat"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Megváltoztatja egy helyi fájl jogait"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Eltávolít egy helyi fájlt"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "A jelenlegi helyi könyvtár tartalmának mutatása"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Helyi könyvtár létrehozása"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Jelenlegi helyi könyvtár mutatása"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Egy helyi fájl átnevezése"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Egy helyi könyvtár eltávolítása"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Távoli könyvtár létrehozása"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Helyi fájl(ok) feltöltése"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Kapcsolódás egy távoli géphez"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Jelenlegi távoli könyvtár mutatása"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Kilépés a gFTP-ből"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Távoli fájl átnevezése"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Egy távoli könyvtár eltávolítása"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Konfigurációs fájl változóinak mutatása. A set változó=érték paranccsal "
 "változót is be tud állítani."
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "hely"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Helyspecifikus parancs kiadása"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Hiba: Parancs nem értelmezhető\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s sikeresen letöltve %.2f KB/s sebességgel\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s fájl kihagyása a(z) %s gépen\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Fájlátvitel leállítása a(z) %s gépen\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nem lehet letölteni a(z) %s-t a(z) %s gépről\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1906,37 +1880,36 @@ msgstr ""
 "%d fájl vagy könyvtár nem vihető át. Ellenőrizze a naplót a megfelelően át "
 "nem vitt elemekért."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Kattintson a Leállítás gombra, mielőtt bármi mást csinál\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Könyvjelző futtatása"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Könyvjelző hozzáadása: Meg kell adnia egy nevet a könyvjelzőnek\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Könyvjelző hozzáadása: %s könyvjelzőnév már létezik, ezért nem lehet "
 "hozzáadni\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Könyvjelző hozzáadása"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Könyvjelző hozzáadása: Meg kell adnia egy gépnevet\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1946,31 +1919,31 @@ msgstr ""
 "/ jel használatával almenübe teheti a bejegyzést.\n"
 "(például: Linuxos helyek/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Jelszó megjegyzése"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Meg kell adnia egy nevet a könyvjelzőnek."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Új mappa"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Adja meg a létrehozandó mappa nevét"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Új elem"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Adja meg a létrehozandó elem nevét"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1979,106 +1952,99 @@ msgstr ""
 "Biztosan törölni szeretné a(z) %s könyvjelzőt\n"
 "és annak összes gyermekfolyamatát?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Könyvjelző törlése"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Könyvjelzők"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Bejegyzés szerkesztése"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Gépnév:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Távoli könyvtár:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Helyi könyvtár:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Felhasználói fiók:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Belépés ANONYMOUS-ként"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Mégsem  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fájl/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fájl/Új ma_ppa..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fájl/Új _elem..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fájl/_Törlés"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fájl/T_ulajdonságok..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fájl/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fájl/_Bezárás"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Könyvjelzők szerkesztése"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2086,91 +2052,90 @@ msgstr ""
 "Be tudja állítani a fájljai attribútumait\n"
 "Megjegyzés: Nem minden FTP-kiszolgáló támogatja a chmod szolgáltatást"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciális"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Ragadós"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Felhasználó"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Olvasás"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Írás"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Csoport"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Biztosan törölni szeretné ezt a(z) %ld fájlt és %ld könyvtárat"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Biztosan törölni szeretné ezt a(z) %ld fájlt"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Biztosan törölni szeretné ezt a(z) %ld könyvtárat"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Fájlok és könyvtárak törlése"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "%s URL érkezett\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Húzd és ejtsd"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Kilépés"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2178,468 +2143,455 @@ msgstr ""
 "Fájlátvitel folyamatban.\n"
 "Biztosan ki szeretne lépni?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Hely megnyitása"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Adja meg célgép URL-jét"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/_1. ablak"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/_2. ablak"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_ASCII"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/Bi_náris"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Fájl/T_ulajdonságok..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Kilépés"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/He_lyi"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Helyi/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Helyi/URL me_gnyitása..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Helyi/Szét_kapcsolás"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Helyi/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Helyi/Fájlspec meg_változtatása..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Helyi/Kivál_asztott megjelenítése"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Helyi/Össze_s kijelölése"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Helyi/Minden fájl kijelölése"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Helyi/Kiválasztás leszedése mindről"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Helyi/Könyvtárlista mentése..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Helyi/SITE parancs küldése..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Helyi/Kön_yvtárváltás"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Helyi/_Jogosultságok..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Fájl/Ú_j mappa..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Helyi/Át_nevezés..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Helyi/_Törlés..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Helyi/S_zerkesztés..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Helyi/_Megtekintés..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Helyi/_Frissítés"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Távoli"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Távoli/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Távoli/_Hely megnyitása..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Távoli/Szétka_pcsolás"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Távoli/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Távoli/Fájlspec meg_változtatása..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Távoli/Kivál_asztott megjelenítése"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Távoli/Össze_s kijelölése"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Távoli/Minden fájl kijelölése"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Távoli/Kiválasztás leszedése mindről"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Távoli/Könyvtárlista mentése..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Távoli/SITE parancs küldése..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Távoli/Kön_yvtárváltás"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Távoli/_Jogosultságok..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Távoli/Ú_j mappa..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Távoli/Át_nevezés..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Távoli_/Törlés..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Távoli/S_zerkesztés..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Távoli/_Megtekintés..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Távoli/_Frissítés"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Könyvjelzők"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Könyvjelzők/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Könyvjelzők/Könyvjelző _hozzáadása"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Könyvjelzők/Könyvjelzők szerkesztése"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Könyvjelzők/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Átvitel"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Átvitel/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Átvitel/_Indítás"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Átvitel/_Leállítás"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Átvitel/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Átvitel/_Jelenlegi fájl kihagyása"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Átvitel/Fájl _eltávolítása"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Átvitel/Fájl mozgatása _fel"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Átvitel/Fájl mozgatása _le"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Átvitel/Fájlok le_töltése"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Átvitel/Fájl_ok feltöltése"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Napló"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Napló/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Napló/_Törlés"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Napló/_Megjelenítés"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Napló/M_entés..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Eszközök"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Eszközök/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Eszközök/_Ablakok összehasonlítása"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Eszközök/_Gyorsítótár törlése"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Súgó"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Súgó/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Gép: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Gép: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Felhasználó: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "Fe_lhasználó: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Jelszó: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Parancs: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Méret"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dátum"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attribútumok"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Folyamatjelző"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Hiba: Meg kell adnia a kapcsolat célgépének nevét\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Adja meg a felhasználónevet"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Adja meg a felhasználónevét ehhez a helyhez"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Adja meg a jelszavát ehhez a helyhez"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Művelet megszakítva... meg kell adnia egy karakterláncot\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Könyvtár létrehozása"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Adja meg a létrehozandó könyvtár nevét"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Mire szeretné átnevezni %s-t?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Hely"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Helyspecifikus parancs kiadása"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "A SITE befűzése ez elé"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Kihagyva"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Folytatás"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Művelet"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Fájlok átvitele"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2647,61 +2599,61 @@ msgstr ""
 "A következő fájlok a helyi és a távoli számítógépen is léteznek\n"
 "Válassza ki, mit szeretne tenni"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Fájl kihagyása"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Mindent kijelöl"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Kijelölés megszüntetése"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Fájlspec megváltoztatása: Művelet megszakítva... Meg kell adnia egy "
 "karakterláncot\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Fájlspec megváltoztatása"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Adja meg az új fájlspecifikációt"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Hiba: %s fájlt nem lehet írásra megnyitni: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Könyvtárlista mentése"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Hiba: Nem lehet írni a(z) %s-t: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Napló sikeresen elmentve %s fájlba\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Napló mentése"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2710,11 +2662,11 @@ msgstr ""
 "A COPYING licencegyezmény-fájl nem található. Bizonyosodjon meg arról, hogy "
 "az a(z) %s vagy a(z) %s könyvtárban van."
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "A gFTP névjegye"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2725,27 +2677,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Hivatalos honlap: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Névjegy"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licencegyezmény"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Bezárás  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Ablakok összehasonlítása"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Lekapcsolódik a távoli kiszolgálóról"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2753,72 +2701,56 @@ msgstr ""
 "Kapcsolódás a gép mezőben megadott géphez. Ha a gép mező üres, egy "
 "párbeszédablak fog megjelenni, ahol megadhatja az URL-t."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (gyorsítótárból) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nincs kapcsolat"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Hiba %s fájl megnyitásakor: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: nincs kapcsolat távoli kiszolgálóval\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Ez a szolgáltatás nem használható ezzel a protokollal\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: csak egy elem lehet kiválasztva\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: legalább egy elemet ki kell választani\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Megváltoztatás"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Igen  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nem  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Könyvtárlista lekérdezése"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Leállítás  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2827,109 +2759,89 @@ msgstr ""
 "%ld könyvtár és %ld fájl\n"
 "jött."
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Hiba: A(z) %s fájl nem található sem %s, sem %s alatt.\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Gép szerkesztése"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Gép hozzáadása"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Típus:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Típus:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Hálózati cím"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Hálózati cím:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Hálózati maszk"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Há_lózati maszk:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Tartomány:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Hálózati maszk"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Helyi gépek"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "S_zerkesztés"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Alkalmaz"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Fájlnevek letöltése..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Kapcsolódás..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Fájlok letöltése: nincs kapcsolat távoli géppel\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Hiba: a(z) %d. gyermekfolyamat visszatérése: %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "A(z) %d. gyermekfolyamat sikeresen tért vissza\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Hiba: a(z) %d. gyermekfolyamat nem fejeződött be megfelelően\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Hiba: Nem található információ a(z) %s fájlról: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "%s fájl nem változott\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2938,115 +2850,153 @@ msgstr ""
 "%s fájl megváltozott.\n"
 "Feltölti?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Fájl szerkesztése"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Befejezve"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Elküldve %s/%s, %.2fKB/s, %02d:%02d:%02d becsült hátralévő idő"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Letöltve %s/%s, %.2fKB/s, %02d:%02d:%02d becsült hátralévő idő"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Elküldve %s/%s, átvitel beragadt, hátralévő idő nem ismert"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Letöltve %s/%s, átvitel beragadt, hátralévő idő nem ismert"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Ismeretlen százalék kész. (Fájl %ld/%ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% kész, becsült hátralévő idő: %02d:%02d:%02d. (Fájl %ld/%ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Fájlnevek letöltése...%s bájt"
 
-#: ../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
+#: 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 "Nincs kijelölt fájlátvitel\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Nézet"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Megtekintés: %s egy könyvtár. Nem lehet megnézni.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Hiba: %s egy könyvtár. Nem lehet szerkeszteni.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Szerkesztés: meg kell adnia egy szerkesztőt az opciók ablakban\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Megtekintés: Másik folyamat létrehozása sikertelen: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "%s %s program futtatása\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s megnyitása %s programmal\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s fájl megtekintése\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Megtekintés: Nem lehet megnyitni a(z) %s fájlt: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nem lehet megnyitni a(z) %s vezérlőterminált\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Felhasználónév [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s már létezik. (forrás mérete: %s, cél mérete: %s):\n"
 "felülírás (o), folytatás (r), átugrá(s), mindegyik felülírása(O), mindegyik "
 "folytatása (R), mindegyik átugrása (S): (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Mégsem  "
+
+#~ msgid "Host: "
+#~ msgstr "Gép: "
+
+#~ msgid "User: "
+#~ msgstr "Felhasználó: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Bezárás  "
+
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Igen  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nem  "
+
+#~ msgid "Type:"
+#~ msgstr "Típus:"
+
+#~ msgid "Network Address"
+#~ msgstr "Hálózati cím"
+
+#~ msgid "_Edit"
+#~ msgstr "S_zerkesztés"
+
+#~ msgid "Apply"
+#~ msgstr "Alkalmaz"
diff --git a/po/it.po b/po/it.po
index d311cfd..8613203 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,12 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-2.0.7b\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&component=general\n"
-"POT-Creation-Date: 2010-10-30 16:13+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2010-10-23 18:42+0200\n"
 "Last-Translator: Claudio Arseni <claudio arseni gmail com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,89 +21,88 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s non valido\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Errore: riga %s non valida nel file indice della cache\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Errore: impossibile creare la directory %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Errore: impossibile creare il file temporaneo: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Errore durante la chiusura del descrittore file: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Errore: impossibile effettuare la ricerca nel file %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr ""
-"Errore nella conversione del set di caratteri della stringa %s da %s a %s: %"
-"s\n"
+"Errore nella conversione del set di caratteri della stringa %s da %s a %s: "
+"%s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Errore: impossibile aprire il file locale %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Errore: impossibile scrivere sul socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Errore: impossibile leggere dal socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Errore gFTP: nome file dei segnalibri errato %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Attenzione: impossibile trovare il file principale dei segnalibri %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Errore gFTP: impossibile aprire il file dei segnalibri %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Avviso gFTP: ignorata la riga %d nel file dei segnalibri: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Avviso gFTP: la riga %d non ha abbastanza argomenti\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -114,7 +113,7 @@ msgstr ""
 "Sintassi: dont_use_proxy=.dominio oppure dont_use_proxy=indirizzo di rete/"
 "netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -123,55 +122,55 @@ msgstr ""
 "visualizzazione. Nota: tutti gli argomenti eccetto l'estensione del file "
 "sono opzionali"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Errore gFTP: il nome del file di configurazione %s non è valido\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Errore gFTP: impossibile creare la directory %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Errore gFTP: impossibile trovare il file di configurazione principale %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "È stato eseguito un make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Errore gFTP: impossibile aprire il file di configurazione %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Chiusura in corso a causa di un errore nella riga %d del file di "
 "configurazione\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Avviso gFTP: ignorata la riga %d nel file di configurazione: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Errore gFTP: il nome del file di registro %s non è valido\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Avviso gFTP: impossibile aprire %s in scrittura: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -180,7 +179,7 @@ msgstr ""
 "<masneyb gftp org>. Attenzione: qualsiasi commento aggiunto a questo file "
 "sarà sovrascritto"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -192,7 +191,7 @@ msgstr ""
 "da qualcuno posto alle proprie spalle mentre si modifica il file. "
 "Precedentemente, le password erano conservate usando testo in chiaro."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -203,96 +202,95 @@ msgstr ""
 "sarà sovrascritto. Se una voce ha un asterisco (*) nel commento, non può "
 "essere modificata in gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<sconosciuto>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "Errore fatale di gFTP: opzione di configurazione «%s» non trovata nella "
 "tabella hash globale\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Errore: impossibile caricare il file %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Errore: impossibile scrivere sul file %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Errore: errore nel chiudere il file %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Ricevuto elenco file danneggiato dal server FSP %s\n"
 
-#: ../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
+#: 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 "sconosciuto"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Impossibile ottenere l'elenco della directory FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Directory correttamente cambiata in %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Impossibile cambiare la directory in %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Rimozione di %s avvenuta correttamente\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Errore: impossibile rimuovere la directory %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Errore: impossibile rimuovere il file %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Directory %s creata correttamente\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s rinominato correttamente in %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Errore: impossibile rinominare %s in %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -300,7 +298,7 @@ msgstr ""
 "FTPS non disponibile a causa della mancata compilazione del supporto a SSL. "
 "Chiusura della connessione.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -308,107 +306,105 @@ msgstr ""
 "HTTPS non disponibile a causa della mancata compilazione del supporto a SSL. "
 "Chiusura della connessione.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Impossibile stabilire la directory di lavoro corrente: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Directory locale correttamente cambiata in %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Impossibile cambiare la directory locale in %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Errore: impossibile troncare il file locale %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Impossibile ottenere l'elenco della directory locale %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Permessi di %s correttamente cambiati in %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Errore: impossibile cambiare i permessi di %s in %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "La data di %s è stada modificata con successo\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Errore: impossibile modificare la data di %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "filesystem locale"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uso: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nessuno"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "file"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "dimensione"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "utente"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "gruppo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "data"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attributi"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "discendente"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendente"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Generale"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programma di visualizzazione:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -416,29 +412,29 @@ msgstr ""
 "Programma predefinito per la visualizzazione dei file. Se non specificato "
 "verrà utilizzato quello interno"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programma di modifica:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Programma predefinito per la modifica dei file."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Dimensione massima finestra del registro:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "Dimensione massima finestra del registro per la versione GTK+ espressa in "
 "byte"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Set di caratteri remoto:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -446,11 +442,11 @@ msgstr ""
 "Elenco set di caratteri, separati da virgole, per tentare la conversione dei "
 "messaggi remoti nel formato locale"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remoto:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -458,198 +454,202 @@ msgstr ""
 "Rappresenta il valore di LC_TIME del sito remoto. Consente di esaminare "
 "correttamente le date negli elenchi delle directory."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL della cache:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Tempo di validità delle voci presenti nella cache (espresso in secondi)."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Accodare i trasferimenti di file"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Accoda i nuovi trasferimenti di file a quelli già esistenti"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Effettuare un trasferimento alla volta"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Effettuare un solo trasferimento alla volta?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sovrascrivere in maniera predefinita"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Indica se sovrascrivere in maniera predefinita i file o impostare il "
 "recupero dei trasferimenti"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Mantenere i permessi dei file"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Mantiene i permessi originari per i file trasferiti"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Mantenere la data dei file"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Mantiene la data associata ai file trasferiti"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Aggiornare dopo ogni trasferimento"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Aggiorna l'elenco ad albero dopo ogni trasferimento di file"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordinare prima le directory"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Mostra prima le directory e poi i file"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostrare i file nascosti"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostra i file nascosti negli elenchi ad albero"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostrare lo stato del trasferimento nella barra del titolo"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostra lo stato del trasferimento dei file nella barra del titolo"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Avviare i trasferimenti dei file"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Avvia automaticamente i trasferimenti dei file quando si trovano in coda"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Consentire comandi manuali dall'interfaccia"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Consente l'immissione di comandi manuali nell'interfaccia grafica (funzioni "
 "come \"text port\")"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Ricordare l'ultima directory"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Salva l'ultima directory locale e remota quando l'applicazione viene chiusa"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Connettere al server remoto all'avvio"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Connette automaticamente al server remoto quando l'applicazione viene "
 "avviata."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rete"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Timeout di rete:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Il tempo di attesa per l'input/output della rete. Non è un timeout di "
 "inattività."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Tentativi di riconnessione:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Numero dei ritentativi da effettuare. Impostare a 0 per riprovare "
 "indefinitamente"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tempo di attesa:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "I secondi di attesa tra i tentativi di riconnessione"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max kB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Il limite massimo di kB/s per un trasferimento. (Impostare a 0 per "
 "disabilitare)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Dimensione blocchi trasferimento:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "La dimensione dei blocchi usati nel trasferimento dei file. Deve essere un "
 "multiplo di 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocollo predefinito:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Indica il protocollo predefinito da usare"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Abilitare il supporto IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -657,27 +657,27 @@ msgstr ""
 "Indica il comportamento da tenere in caso di doppio clic su di un file negli "
 "elenchi ad albero. 0=Visualizza 1=Modifica 2=Trasferisci file"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Larghezza predefinita elenco ad albero dei file locali"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Larghezza predefinita elenco ad albero dei file remoti"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Altezza predefinita elenchi ad albero dei file locali/remoti"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Altezza predefinita elenco ad albero dei trasferimenti"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Altezza predefinita finestra del registro"
 
-#: ../lib/options.h:177
+#: 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."
@@ -685,15 +685,15 @@ msgstr ""
 "Larghezza colonna nomi file nella finestra dei trasferimenti. Impostare a 0 "
 "per ridimensionare automaticamente."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Colonna predefinita per l'ordinamento"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordinamento crescente o decrescente"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -701,7 +701,7 @@ msgstr ""
 "Larghezza colonna nomi file negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -709,7 +709,7 @@ msgstr ""
 "Larghezza colonna dimensione file negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -717,7 +717,7 @@ msgstr ""
 "Larghezza colonna utente negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -725,7 +725,7 @@ msgstr ""
 "Larghezza colonna gruppo negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -733,7 +733,7 @@ msgstr ""
 "Larghezza colonna data negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -741,76 +741,76 @@ msgstr ""
 "Larghezza colonna attributi negli elenchi ad albero. Impostare a 0 per "
 "ridimensionare automaticamente. Impostare a -1 per disabilitare la colonna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Colore dei comandi inviati al server"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Colore dei comandi ricevuti dal server"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Colore dei messaggi d'errore"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Colore degli altri messaggi del registro"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Locale"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Segnalibro"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Il trasferimento file viaggerà a %.2f kB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 "Errore nell'impostazione di LC_TIME a \"%s\". Ripristino del valore \"%s\"\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Caricamento elenco directory %s dalla cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Caricamento elenco directory %s dal server (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -819,110 +819,110 @@ msgstr ""
 "Attenzione: eliminazione del percorso dal file \"%s\". Il percorso eliminato "
 "(%s) non corrisponde alla directory corrente (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Errore: impossibile scrivere nella cache: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Errore: impossibile trovare il segnalibro %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Errore nei segnalibri: la voce %s non contiene un nome host\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Il protocollo \"%s\" non è attualmente supportato.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Trovato un collegamento simbolico ricorsivo %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Errore: disconnesso da %s. Limite massimo di tentativi raggiunto..."
 "abbandono\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Errore: sito remoto %s disconnesso. Riconnessione fra %d secondi\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Errore: impossibile impostare l'opzione chiudi su exec: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Impossibile aprire il pty principale %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Impossibile creare una coppia del socket: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Errore: impossibile eseguire ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Impossibile creare un altro processo: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nome host del proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nome host del firewall"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Porta per il proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Porta del firewall a cui connettersi"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nome utente proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Nome utente per il firewall"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Password per il proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Password per il firewall"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Utilizzare HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Indica se utilizzare HTTP/1.1 oppure HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -931,84 +931,84 @@ msgstr ""
 "Ricevuta risposta errata dal server, disconnessione.\n"
 "Il server remoto ha restituito una chunk size \"%s\" non valida\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Disconnessione dal sito %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Trasferimento file avviato dalla posizione "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Impossibile ricevere il file %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Recupero elenco directory...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Ricevuta una risposta errata dal server, disconnessione\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Comando SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "utente host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "utente host:porta"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "utente host porta"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "utente host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 "Password da utilizzare in caso di accesso anonimo ad un server FTP remoto"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Account del proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Account del firewall (opzionale)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo di server proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1026,11 +1026,11 @@ msgstr ""
 "\" (password), \"h\" (host), \"o\" (port) oppure \"a\" (account). Per "
 "esempio, per specificare l'utente proxy, si può scrivere %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorare indirizzo PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1042,11 +1042,11 @@ msgstr ""
 "per i router che in una risposta PASV forniscono un indirizzo IP interno "
 "invece di uno esterno."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Trasferimento passivo dei file"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1062,11 +1062,11 @@ msgstr ""
 "disabilitata, gFTP aprirà una porta dal lato client per consentire al server "
 "remoto di connettersi."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Risolvere i collegamenti simbolici remoti (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1078,15 +1078,16 @@ msgstr ""
 "questa opzione. La si dovrebbe disabilitare solo nel caso in cui il server "
 "FTP remoto non supporti l'opzione -L per il comando LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Trasferire file in modalità ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1096,335 +1097,326 @@ msgstr ""
 "avviene tra sistemi UNIX, è preferibile non utilizzare questa opzione. Nel "
 "caso di scaricamento di file binari, l'opzione dovrà essere disabilitata."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Risposta non valida \"%c\" ricevuta dal server.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Creazione di un socket IPv4 non riuscita: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Impossibile trovare un indirizzo IP nella risposta PASV «%s»\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
-"Indirizzo IP nella risposta PASV ignorato, connessione in corso a %d.%d.%d.%"
-"d:%d\n"
+"Indirizzo IP nella risposta PASV ignorato, connessione in corso a %d.%d.%d."
+"%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Impossibile creare una connessione dati: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Impossibile ottenere il nome del socket: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Impossibile collegarsi ad una porta: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Impossibile mettersi in ascolto sulla porta %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Creazione di un socket IPv6 non riuscita: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Errore: non sembra esserci una connessione IPv6. Interruzione.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Riposta EPSV non valida \"%s\"\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Impossibile ottenere l'indirizzo del socket locale: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Impossibile accettare la connessione dal server: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "totale"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Attenzione: impossibile analizzare l'elenco %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Ricerca di %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Impossibile cercare il nome dell'host %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Creazione di un socket non riuscita: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Tentativo di connessione a %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Impossibile connettersi a %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Connesso a %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Impossibile cercare il servizio %s/tcp. Controllare il proprio file "
 "services\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Tempo esaurito per la connessione a %s\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Impossibile ottenere i flag del socket: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Impossibile impostare il socket a \"non-blocking\": %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nome del programma SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Percorso dell'eseguibile SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parametri aggiuntivi per SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parametri aggiuntivi da passare al programma SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Richiedere nome utente e password per SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Richiede nome utente e password per le connessioni SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Esecuzione programma %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Inserire passphrase per la chiave RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Inserire passphrase per la chiave '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Password"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "password"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(sì/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Inserire PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Inserire la password SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Errore: password errata\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: inizializzazione del protocollo\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: versione del protocollo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: apri %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: chiudi\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: apri directory %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: leggi directory\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: rimuovi il file %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: crea directory %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: rimuovi directory %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: percorso reale %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: attributi del file\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "File o directory inesistente"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Non riuscito"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Messaggio d'errore"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nessuna connessione"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Connessione interrotta"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operazione non supportata"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Messaggio sconosciuto restituito dal server"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Errore: messaggio (%d) troppo grande\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Errore: messaggio dal server (%d) troppo grande\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1432,41 +1424,41 @@ msgstr ""
 "Si è verificato un errore nell'inizializzazione di una connessione SSH con "
 "il server remoto. Il messaggio di errore è il seguente:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Apertura di una connessione SSH con %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Accesso al server SSH %s avvenuto correttamente\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motore SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "File di entropia per SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "File di entropia per SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Lunghezza del seme di entropia:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Il massimo numero di byte utilizzato dal seme del motore SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificare peer SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1479,11 +1471,11 @@ msgstr ""
 "Oggetto = %s\n"
 "Errore %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Impossibile ottenere il certificato dal peer\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1492,45 +1484,45 @@ msgstr ""
 "Errore: l'host presente nel certificato SSL (%s) non corrisponde a quello a "
 "cui si è connessi (%s). Chiusura della connessione.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Impossibile inizializzare la libreria OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Errore nel caricamento dei certificati SSL predefiniti\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Errore impostando l'elenco del cifrario (nessun cifrario valido)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Errore: il motore SSL non è stato inizializzato\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Errore nella creazione della connessione SSL (oggetto BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Errore nella creazione della connessione SSL (oggetto SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Errore nel certificato del peer: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operazione annullata\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Attendere %d secondi prima di ritentare la connessione\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1541,7 +1533,7 @@ msgstr ""
 "modificarlo secondo alcune condizioni; per maggiori dettagli consultare il "
 "file COPYING.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Tradotto da:\n"
@@ -1550,70 +1542,70 @@ msgstr ""
 "Davide Patti <dpatti diit unict it>\n"
 "Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione ubuntu-it org>, 2010"
 
-#: ../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
+#: 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 "Errore: non connesso ad alcun sito remoto\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "uso: chmod <permessi> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "uso: rename <vecchio nome> <nuovo nome>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "uso: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "uso: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uso: site <comando sito>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "uso: mkdir <nuova directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "uso: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argomento non valido\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Pulisci la cache delle directory\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uso: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "uso: set [variabile = valore]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Errore: «%s» non è una variabile di configurazione valida.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr ""
 "Errore: la variabile «%s» non è disponibile nella versione testuale di gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1621,288 +1613,288 @@ msgstr ""
 "Comandi supportati:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uso: %s <filtro>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "informazioni"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Mostra informazioni su gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Imposta la modalità Ascii per il trasferimento dei file (solo per FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binario"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Imposta la modalità binaria per il trasferimento dei file (solo per FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Cambia la directory di lavoro remota"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Modifica i permessi di un file remoto"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opzioni disponibili: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Disconnette dal sito remoto"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Elimina un file remoto"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Mostra l'elenco dei file per la directory remota corrente"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Scarica file remoti"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Mostra questa schermata di aiuto"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Cambia la directory di lavoro locale"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Cambia i permessi di un file locale"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Elimina un file locale"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Mostra l'elenco dei file per la directory locale corrente"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crea una directory locale"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Mostra la directory locale corrente"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Rinomina un file locale"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Rimuove una directory locale"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crea una directory remota"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Invia file locali"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Apre una connessione verso un sito remoto"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Mostra la directory remota corrente"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Esce da gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Rinomina un file remoto"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Rimuove una directory remota"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Mostra le variabili del file di configurazione. È possibile anche impostarle "
 "mediante var=valore"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Esegue comandi specifici per il sito"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Errore: comando non riconosciuto\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Trasferimento di %s completato con successo a %.2f kB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Saltato il file %s sull'host %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Interruzione del trasferimento sull'host %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Impossibile scaricare %s da %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1911,36 +1903,35 @@ msgstr ""
 "Impossibile trasferire %d file o directory. Controllare nel registro quali "
 "file o cartelle non sono stati trasferiti."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: premere il pulsante stop prima di qualsiasi altra azione\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Esegui segnalibro"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Aggiunta segnalibro: inserire il nome del segnalibro\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Aggiunta segnalibro: impossibile aggiungere «%s» poiché il nome esiste già\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Aggiungi segnalibro"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Aggiunta di un segnalibro: è necessario inserire un nome per l'host\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1950,31 +1941,31 @@ msgstr ""
 "È possibile separare gli elementi con \"/\" per inserirli in un sottomenù\n"
 "(es: Siti Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Ricordare la password"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "È necessario specificare un nome per il segnalibro."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nuova cartella"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Inserire il nome della cartella da creare"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nuovo elemento"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Inserire il nome del nuovo elemento da creare"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1983,106 +1974,99 @@ msgstr ""
 "Cancellare il segnalibro %s\n"
 "e tutti i segnalibri a esso collegati?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Elimina segnalibro"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Modifica voce"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nome host:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directory remota:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directory locale:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Account:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Connetti come ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Annulla  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/File/_Nuova cartella..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/Nuovo _elemento..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/File/_Elimina"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/File/_Proprietà..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Chiudi"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Modifica segnalibri"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2090,91 +2074,90 @@ msgstr ""
 "Ora è possibile modificare gli attributi dei file\n"
 "Nota: non tutti i server FTP supportano il comando chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciale"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Adesivo"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Utente"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lettura"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Scrittura"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Esecuzione"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Altri"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Eliminare veramente questi %ld file e %ld directory"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Eliminare veramente questi %ld file"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Eliminare veramente queste %ld directory"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Elimina file/directory"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Connetti"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Ricevuto URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Trascina"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Esci"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2182,468 +2165,455 @@ msgstr ""
 "Ci sono dei trasferimenti di file in corso.\n"
 "Uscire dal programma?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Apri posizione"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Inserire un URL a cui collegarsi"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Finestra _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Finestra _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binario"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/Preferen_ze..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Esci"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Locale"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Locale/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Locale/_Apri posizione..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Locale/D_isconnetti"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Locale/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Locale/Cambia _filtro..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Locale/_Mostra selezionati"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Locale/Seleziona _tutto"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Locale/Seleziona tutti i file"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Locale/Deseleziona tutto"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Locale/Salva elenco directory..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Locale/Invia comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Locale/_Cambia directory"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Locale/_Permessi..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Locale/_Nuova cartella..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Locale/Rino_mina..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Locale/_Elimina..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Locale/_Modifica..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Locale/_Visualizza..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Locale/A_ggiorna"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remoto"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remoto/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remoto/_Apri posizione..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remoto/_Disconnetti"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remoto/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remoto/Cambia _filtro..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remoto/_Mostra selezionati"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remoto/Seleziona _tutto"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remoto/Seleziona tutti i file"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remoto/Deseleziona tutti"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remoto/Salva l'elenco della direcotory..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remoto/Invia comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remoto/_Cambia directory"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remoto/_Permessi..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remoto/_Nuova cartella..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remoto/Rino_mina..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remoto/_Elimina..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remoto/_Modifica..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remoto/_Visualizza..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remoto/A_ggiorna"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Segnalibri"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Segnalibri/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Segnalibri/Aggiungi _segnalibro"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Segnalibri/Modifica segnalibri"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Segnalibri/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Trasferimento"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Trasferimento/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Trasferimento/_Avvia"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Trasferimento/Fe_rma"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Trasferimento/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Trasferimento/Salta file _corrente"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Trasferimento/_Rimuovi file"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Trasferimento/Sposta file s_u"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Trasferimento/Sposta file _giù"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Trasferimento/_Recupera file"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Trasferimento/_Colloca file"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Registr_o"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Registro/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Registro/Pulis_ci"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Registro/_Visualizza"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Registro/_Salva..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Strumenti"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Strumenti/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Strumenti/C_onfronta finestre"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Strumenti/_Pulisci cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Aiuto"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Aiuto/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Host: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Host: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Utente: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Utente: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Password: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nome file"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attributi"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Errore: specificare un host al quale connettersi\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Inserire nome utente"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Inserire il proprio nome utente per questo sito"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Inserire la propria password per questo sito"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operazione annullata... è necessario inserire una stringa\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Creazione directory"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Inserire il nome della directory da creare"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Come si vuole rinominare %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Inserire comando specifico per il sito"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Anteporre SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Saltato"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Attesa..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Riprendi"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Salta"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Azione"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Trasferimento file"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2651,61 +2621,61 @@ msgstr ""
 "I seguenti file esistono sia sul computer locale che su quello remoto\n"
 "Scegliere cosa fare"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Saltare il file"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deseleziona tutto"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Cambiamento filtro: operazione annullata...è necessario inserire una "
 "stringa\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Cambiamento filtro"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Inserire la nuova specifica del file"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Errore: impossibile aprire «%s» in scrittura: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Salvataggio elenco della directory"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Errore: errore nella scrittura di %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Scrittura del file di registro su %s eseguita correttamente\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Salva registro"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2714,11 +2684,11 @@ msgstr ""
 "Impossibile trovare il file della licenza COPYING. Accertarsi che sia in %s "
 "o in %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Informazioni su gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2729,27 +2699,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Sito web: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licenza d'uso"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Chiudi  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Confronta le finestre"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Disconnetti dal server remoto"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2757,72 +2723,56 @@ msgstr ""
 "Connette al sito specificato nella voce host. Se il campo viene lasciato "
 "vuoto, apparirà una finestra che consentirà di inserire un URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Non connesso"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Errore nell'apertura del file %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: non connesso ad alcun sito remoto\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: questa caratteristica non è disponibile con il protocollo in uso\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: è necessario selezionare un solo elemento\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: è necessario selezionare almeno un elemento\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Cambia"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sì  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  No  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Ricezione elenco directory"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2831,109 +2781,89 @@ msgstr ""
 "Ricevute %ld directory\n"
 "e %ld file"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Errore di gFTP: impossibile trovare il file %s in %s o %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Modifica host"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Aggiungi host"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Indirizzo di rete"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "I_ndirizzo di rete:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Maschera"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Masch_era"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Dominio:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Maschera"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Host locali"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Modifica"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Applica"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Ricezione elenco file..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Ricezione file: non connesso ad alcun sito remoto\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Errore: il processo figlio %d ha restituito %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Processo figlio %d restituito correttamente\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Errore: il processo figlio %d non è terminato correttamente\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Errore: impossibile ottenere informazioni sul file «%s»: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Il file %s non è stato modificato\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2942,116 +2872,155 @@ msgstr ""
 "Il file %s è stato modificato.\n"
 "Caricarlo sul sito remoto?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Modifica file"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Completato"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Inviati %s di %s a %.2fKB/s, tempo residuo stimato %02d.%02d.%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Ric. %s di %s a %.2fkB/s, tempo residuo stimato %02d.%02d.%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Inviati %s di %s, trasferimento bloccato, tempo residuo sconosciuto"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Ricevuti %s di %s, trasferimento bloccato, tempo residuo sconosciuto"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Percentuale di completamento sconosciuta (file %ld su %ld)."
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% completato, tempo residuo stimato %02d.%02d.%02d (file %ld di %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Ricezione nomi dei file...%s byte"
 
-#: ../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
+#: 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 "Non ci sono trasferimenti di file selezionati\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visualizza"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Modifica"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Visualizza: %s è una directory. Impossibile visualizzarla.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Modifica: %s è una directory. Impossibile modificarla.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 "Modifica: è necessario specificare un programma di modifica nelle opzioni\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Visualizza: impossibile creare un altro processo: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Esecuzione del programma: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Apertura di %s con %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Visualizzazione del file %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Visualizza: impossibile aprire il file %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Impossibile aprire terminale di controllo %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nome utente [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s esiste già. (Dimensione sorgente %s, dimensione destinazione %s):\n"
 "S(o)vrascrivi, (r)iprendi, (s)alta, s(O)vrascrivi tutti, (R)iprendi tutti, "
 "(S)alta tutti: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Annulla  "
+
+#~ msgid "Host: "
+#~ msgstr "Host: "
+
+#~ msgid "User: "
+#~ msgstr "Utente: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Chiudi  "
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Sì  "
+
+#~ msgid "  No  "
+#~ msgstr "  No  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Network Address"
+#~ msgstr "Indirizzo di rete"
+
+#~ msgid "_Edit"
+#~ msgstr "_Modifica"
+
+#~ msgid "Apply"
+#~ msgstr "Applica"
diff --git a/po/ja.po b/po/ja.po
index 487ba69..315331d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,97 +9,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-29 07:48+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-04-08 00:55+0900\n"
 "Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s は無効です\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "エラー: キャッシュのインデックス・ファイルにおかしな行 %s があります\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, 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
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "エラー: ローカルファイル %s を開けません: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "エラー: ソケットに書き込めませんでした: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "エラー: ソケットから読み込めませんでした: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "gFTP エラー: マスター・ブックマークのファイル %s が見つかりません\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP 警告 : ブックマーク・ファイルの %d 行をスキップします: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP 警告: %d 行は引数が足りません\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -109,7 +108,7 @@ msgstr ""
 "さないようにすることも可能です。書き方: dont_use_proxy=.ドメイン または "
 "dont_use_proxy=ネットワーク番号/ネットマスク"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -117,52 +116,52 @@ msgstr ""
 "ext=ファイル拡張子:XPM ファイル:アスキー(A)またはバイナリ(B):ビュワープログラ"
 "ム。注記: すべての引数でファイルの拡張子は省略可能です"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "make install を行いましたか?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP エラー: ログ・ファイル名 %s は無効です\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -170,7 +169,7 @@ msgstr ""
 "gFTP のブックマーク・ファイル。Copyright (C) 1998-2007 Brian Masney "
 "<masneyb gftp org> 注意: このファイルに追加したコメントは上書きされます"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -182,7 +181,7 @@ msgstr ""
 "あなたの肩越しからパスワードを簡単に盗み見されないようにするものです。この前"
 "に、すべてのパスワードが通常のファイルへ格納されています。"
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -192,96 +191,95 @@ msgstr ""
 "注意: このファイルに追加した設定は上書きされます。(*) がついている行はコメン"
 "ト扱いで、gFTP 内部で変更することはできません"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<不明>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "エラー: ファイル %s をアップロードできません\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "エラー: ファイル %s に書き込めません: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "エラー: ファイルのクローズ中にエラーがありました: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP サーバ %s のファイル一覧は壊れています\n"
 
-#: ../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
+#: 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 "不明"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP フォルダ %s の一覧を取得できません: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "フォルダを %s へ変更しました\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "%s にディレクトリを変更できませんでした\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s の削除が完了しました\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "エラー: ファイル %s を削除できませんでした: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -289,7 +287,7 @@ msgstr ""
 "SSL サポート付きでビルドされていないので、FTPS サポートを利用できません。接続"
 "を中止します。\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -297,107 +295,105 @@ msgstr ""
 "SSL サポート付きでビルドされていないので、HTTPS サポートを利用できません。接"
 "続を中止します。\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "現在の作業中のフォルダを認識できません: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "ローカル・フォルダを %s へ変更しました\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "ローカル・フォルダを %s へ変更できませんでした: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "エラー: ローカルファイル %s を切りつめれません: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "ローカル・フォルダ %s の一覧を取得できません: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s のモードを %o へ変更しました\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "エラー: %s のモードを %o へ 変更できません: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s のタイムスタンプを変更できました\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "エラー: %s のタイムスタンプを変更できませんでした: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ローカルファイルシステム"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "用法: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "なし"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ファイル"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "サイズ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ユーザ"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "グループ"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "タイムスタンプ"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "属性"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "降順"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "昇順"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "全般"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "ファイルビュワー:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -405,27 +401,27 @@ msgstr ""
 "ファイルを表示するために使用するデフォルトのビュワーです。ここが空欄の場合"
 "は、内部実装のビュワーが使用されます。"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "エディタ:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ファイルを編集するデフォルトのエディタです"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "ログ・ウィンドウの最大サイズ:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "ログ・ウィンドウの最大サイズ (バイト) です"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "リモートの文字セット:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -433,195 +429,199 @@ msgstr ""
 "リモート・メッセージを現在利用しているロケールに変換するために試行する文字"
 "セットのリスト (',' で区切る) です"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "リモートの LC_TIME 値:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "キャッシュ TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "キャッシュ・エントリを無効にするまでの秒数です"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ファイル転送を追加する"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "新規に転送するファイルを既存のファイルの上に追加します"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "一度に一つの転送を行う"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "一度に一つだけの転送を行うかどうか"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "デフォルトで上書きする"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "デフォルトでファイルを上書きするか、ファイル転送を続行します"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ファイルのアクセス権を継承する"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "転送したファイルのアクセス権をそのまま継承します"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ファイルの日付を維持する"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "転送したファイルの日付をそのまま維持します"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ファイル転送毎にリフレッシュする"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ファイルを転送する度にファイル一覧をリフレッシュします"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "フォルダを最初にソートする"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "最初にフォルダを、その次にファイルを表示します"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "隠しファイルを表示する"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "ファイル一覧で隠しファイルも表示します"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "転送ステータスを表示する"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "ファイルの転送ステータスをタイトルバーに表示します"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "自動的にファイル転送を開始する"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "ファイル転送要求がキューにたまったら、自動的にファイル転送を開始します"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI でコマンドの手動入力を許可する"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI 上でコマンドの手動入力を許可します (テキスト版と同じ機能です)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "最後のディレクトリを記憶する"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "起動時にリモート・サーバに接続"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "ネットワークのタイムアウト [秒]:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "ネットワークの入力/出力がタイムアウトするまで待機します。これはアイドルのタイ"
 "ムアウトではありません。"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "接続リトライ数:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "自動的に再接続をトライする回数です。0 の場合は無限にトライし続けます"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "リトライ間隔:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "リトライする間の待ち時間"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "最大転送速度 [Kバイト/秒]:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "最大ファイル転送速度 [Kバイト/秒]  (0では無効になります)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "転送ブロックサイズ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "ファイルを転送するときに使うブロックサイズです。この値は 1024 の倍数であるべ"
 "きです。"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "デフォルトのプロトコル:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "この使用をデフォルトのプロトコルとして使用します"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 サポートを有効にする"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -629,264 +629,264 @@ msgstr ""
 "これはファイル一覧で、ファイルをダブルクリックした場合の動作を定義するもので"
 "す [0=表示 1=編集 2=転送]"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ローカルのファイル一覧ボックスのデフォルトの幅"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "リモートのファイル一覧ボックスのデフォルトの幅"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ローカル/リモートのファイル一覧ボックスのデフォルトの高さ"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "ログウィンドウの転送リストボックスのデフォルトの高さ"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "ログウィンドウのデフォルトの高さ"
 
-#: ../lib/options.h:177
+#: 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=自動的に調整]"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ソートする際のデフォルトの桁"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "昇順また降順でソートします"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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=表示しない]"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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=表示しない]"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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=表示しない]"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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=表示しない]"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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=表示しない]"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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=表示しない]"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "サーバに送信するコマンドの色です"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "サーバから受信するコマンドの色です"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "エラーメッセージの色です"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "ログメッセージの色です"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "ローカル"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "ブックマーク"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ファイル転送レートが %.2f Kバイト/秒になりました\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME を '%s' に設定中にエラーがありました。'%s' に戻します\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "キャッシュからフォルダ一覧 %s を取得中です (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "サーバからフォルダ一覧 %s を取得中です (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, 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:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "エラー: キャッシュへ書き込めません: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "エラー: ブックマーク %s が見つかりませんでした\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "ブックマーク・エラー: ブックマークのエントリ %s にはホスト名がありません\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "プロトコル '%s' はサポートしていません\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "再帰的シンボリックリンク %s を発見しました\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "エラー: リモート・サイト %s から接続を切断されました。最大リトライ数に達しま"
 "した...あきらめます。\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "エラー: 実行権フラグを閉じられません: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "マスター PTY %s:%s を開けません\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ソケット・ペア作成に失敗しました: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "エラー: ssh を実行できません: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "もう一つのプロセスを生成できません: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "プロキシのホスト名:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ファイアウォールのホスト名:"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "プロキシのポート番号:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "接続するファイアウォール上のポート番号です"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "プロキシのユーザ名:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ファイアウォールでのユーザ名です"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "プロキシのパスワード:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ファイアウォールでのパスワードです"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 を使用する"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -895,83 +895,83 @@ msgstr ""
 "サーバからおかしな応答を受け取りました。接続を閉じます\n"
 "リモート・サーバから不正なチャンク・サイズ '%s' が返されました\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "途中からファイル転送を開始 "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ファイル %s を回復できません\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "フォルダ一覧の取得中...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "サーバからおかしな応答を受け取りました。接続を閉じます\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE コマンド"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "ユーザ ホスト"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "ユーザ ホスト:ポート番号"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "認証"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "ユーザ ホスト ポート番号"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "ユーザ ホスト 認証なし"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTPプロキシ"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-メールアドレス:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "リモートの FTP サーバに匿名でログインする際に使用するパスワードです"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "プロキシのアカウント:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ファイアウォール・アカウント(省略可)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "プロキシ・サーバの種類:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -988,11 +988,11 @@ msgstr ""
 "号)、'a' (アカウント名) を指定します。例えば、プロキシ・ユーザを指定する場合"
 "は \"%pu\" にします。"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV アドレスを無視"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1000,11 +1000,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive ファイル転送を有効にする"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1019,11 +1019,11 @@ msgstr ""
 "常に有効にしておいてください。これを無効にすると、gFTP はクライアント側のポー"
 "トを開いてリモート・サーバ側に接続を試みて貰います。"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "リモートのシンボリックリンクを有効にする (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1035,15 +1035,16 @@ msgstr ""
 "サーバが LIST コマンドに対して '-L' をサポートしていない場合にのみ無効にして"
 "ください。"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII モードでファイルを転送する"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1052,333 +1053,324 @@ msgstr ""
 "なります。UNIX から UNIX へ転送する場合は、これを無効にした方が良いでしょう。"
 "バイナリ・データをダウンロードする場合は、これを無効にしてください。"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "データ接続を作成できません: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ポートに Bind できません: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "ポート番号 %d を Listen できません: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6 ソケット作成に失敗しました: %s\n"
 
-#: ../lib/rfc959.c:895
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "EPSV 応答 '%s' が無効です\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ローカル・ソケットのアドレスを取得できません: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "サーバからの接続を許可できません: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "合計"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "ソケット・フラグを取得できません: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "ソケットに非ブロック (non-blocking) 属性をセットできません: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH プログラム名:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH 実行プログラムへのパスです"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH 引数:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH プログラムに引き渡す引数です"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ユーザ名/パスワードを要求する"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH 接続用のユーザ名/パスワードを要求します"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "プログラム %s の実行中\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA鍵のパスフレーズを入力してください"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "鍵のパスフレーズを入力してください"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "パスワード"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "パスワード"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE を入力:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "パスワードを入力してください"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecureID のパスワードを入力してください:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "エラー: 入力したパスワードが間違っています\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: プロトコルの初期化\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: プロトコルのバージョン %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s のオープン\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: クローズ\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: フォルダ %s を開きます\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: フォルダを読み込みます\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ファイル %s を削除します\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: フォルダ %s を作成します\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: フォルダ %s を削除します\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: 実際のパス名 %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ファイルの属性\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "そのようなファイルまたはフォルダはありません"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "失敗"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "おかしなメッセージ"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "接続なし"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "接続が閉じました"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "サポートされていない操作"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "サーバから不明なメッセージを受け取りました"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "エラー: メッセージのサイズ %d は大きすぎます\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1386,41 +1378,41 @@ msgstr ""
 "リモート・サーバで SSH 接続の初期化に失敗しました。リモート・サーバからのエ"
 "ラーメッセージ:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s へ SSH 接続する\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH サーバ %s へのログ書き込みが完了しました\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL エンジン"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL エントロピー・ファイル:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL エントロピー・ファイルです"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "エントロピー速度の長さ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL エンジンの乱数の種に使用する最大バイト数です"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL ピアを検証する"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1433,11 +1425,11 @@ msgstr ""
 "Subject = %s\n"
 "エラー %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "ピア認証を取得できません\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1446,45 +1438,45 @@ msgstr ""
 "エラー: SSL 認証のホスト (%s) と接続しようとしているホスト (%s) が一致しませ"
 "ん。接続を閉じます。\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL ライブラリを初期化できません\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "デフォルトの SSL 認証の読み込みでエラー\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Cipher リストの設定でエラー (Ciphers が正しくありません)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "エラー: SSL エンジンが初期化されていません\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL 接続の設定でエラー (BIO オブジェクト)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL 接続の設定でエラー (SSL オブジェクト)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ピア認証でエラーが発生しました: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "操作が取り消されました\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "再び接続するまで, %d 秒お待ちください\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1494,73 +1486,73 @@ msgstr ""
 "リーソフトウェアです。特定条件下での再配布を歓迎します。詳細は COPYING を参照"
 "してください。\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "翻訳者: 古川泰之/稲垣良一/鎌ヶ迫正俊/相花毅"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "用法: chmod <モード> <ファイル>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "用法: rename <古い名前> <新しい名前>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "用法: delete <ファイル>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "用法: rmdir <ディレクトリ>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "用法: site <サイトで実行するコマンド>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "用法: mkdir <新しいディレクトリ>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "用法: chdir <ディレクトリ>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "不正な引数です\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "フォルダのキャッシュをクリアする\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "用法: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "用法: set [変数 = 値]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "エラー: 変数 %s は正しい設定変数ではありません\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "エラー: gFTP テキスト版では変数 %s を利用できません\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1568,321 +1560,320 @@ msgstr ""
 "サポートしているコマンド:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "用法: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "情報"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP の情報を表示します"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "現在のファイル転送モードを ASCII にします (FTPの場合のみ)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "現在のファイル転送モードをバイナリにします (FTPの場合のみ)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "リモートの作業ディレクトリを変更する"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "リモートのファイルのアクセス権を変更する"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "利用可能なオプション: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "リモートのサイトを閉じます"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "リモート・ファイルを削除する"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "リモート・ディレクトリの一覧を表示する"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "リモートのファイルのダウンロード"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "このヘルプ画面を表示する"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "ローカルのディレクトリを変更する"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "ローカルのファイルのアクセス権を変更する"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ローカルファイルを削除する"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "現在のローカル・ディレクトリの一覧を表示する"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "ローカルのディレクトリを作成する"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "現在のローカル・ディレクトリを表示する"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "ローカルファイルの名前を変更する"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ローカルのディレクトリを削除する"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "リモートのディレクトリを作成する"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "ローカルのファイルをアップロードする"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "リモート・サイトの接続を開く"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "リモートのディレクトリを表示する"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP を終了する"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "リモート・ファイルの名前を変更する"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "リモートのディレクトリを削除する"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "設定ファイルの変数を表示する。\"変数=値\" の書式で変数をセットすることも可能"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "サイト"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "サイトで実行するコマンド"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "エラー: コマンドが認識できません\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s の転送が完了しました (%.2f Kバイト/秒)\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ホスト %s 上のファイル %s をスキップしています\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "ホスト %s で転送を停止しています\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s を %s からダウンロードできませんでした\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: まず最初にストップボタンを押してください\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "ブックマークの表示"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "ブックマーク追加: ブックマーク名を入力してください\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "ブックマーク追加: すでに同じブックマーク名 %s が存在します\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "ブックマーク追加"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "ブックマーク追加: ホスト名を入力してください\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1892,31 +1883,31 @@ msgstr ""
 "\"/\" を用いると、サブメニューにすることが可能です。\n"
 "(例: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "パスワードを覚えて置いてください"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "ブックマーク名を指定しなくてはなりません。"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "新規フォルダ"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "作成する新規フォルダ名を入力してください"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "新規アイテム"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "新規アイテム名を入力してください"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1925,106 +1916,99 @@ msgstr ""
 "本当にブックマーク %s とその下のすべてを\n"
 "削除してもよろしいですか?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ブックマークの削除"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "エントリの編集"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "メモ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ホスト名:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "ポート番号:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "リモート・フォルダ:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ローカル・フォルダ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "アカウント:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  キャンセル  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ファイル(_F)/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ファイル/新規フォルダ(_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ファイル/新規アイテム(_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ファイル/削除(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ファイル/プロパティ(_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ファイル/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ファイル/閉じる(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "ブックマークの編集"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2032,92 +2016,91 @@ msgstr ""
 "現在、自分のファイル属性を調整できます\n"
 "注記: いくつかのFTPサーバはモード変更機能をサポートしていません"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "特別"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ステッキー"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ユーザ"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "読み込み"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "書き込み"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "実行"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "グループ"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "その他"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "本当にこれら %ld 個のファイルと %ld 個のフォルダを削除してもよろしいですか?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "本当にこれら %ld 個のファイルを削除してもよろしいですか?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "本当にこれら %ld 個のフォルダを削除してもよろしいですか?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ファイル/フォルダの削除"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "削除"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "接続"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s を受信しました\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ドラッグ・アンド・ドロップ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "終了"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2125,502 +2108,489 @@ msgstr ""
 "転送途中のファイルがあります。\n"
 "本当に終了してもよろしいですか?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "場所を開く"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "接続先の URL を入力してください:"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FTP(_F)"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/ウィンドウ1(_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/ウィンドウ2(_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/アスキー(_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/バイナリ(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/ファイル/設定(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP(F)/終了(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ローカル(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/ローカル(L)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/ローカル/場所を開く(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/ローカル/接続を閉じる(_I)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/ローカル/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/ローカル/ファイル・フィルタの変更(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/ローカル/選択したアイテムの表示(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/ローカル/すべてを選択(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/ローカル/すべてのファイルを選択"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/ローカル/すべての選択を解除"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/ローカル/フォルダ一覧の保存..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/ローカル/SITEコマンド送信..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/ローカル/フォルダの変更(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/ローカル/パーミッション(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ローカル/新規フォルダ(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/ローカル/名前の変更(_M)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/ローカル/削除(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/ローカル/編集(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/ローカル/表示(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/ローカル/更新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/リモート(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/リモート/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 #, fuzzy
 msgid "/Remote/_Open Location..."
 msgstr "/リモート(R)/URLを開く(_U)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 #, fuzzy
 msgid "/Remote/D_isconnect"
 msgstr "/リモート(R)/接続を閉じる"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/リモート(R)/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 #, fuzzy
 msgid "/Remote/Change _Filespec..."
 msgstr "/リモート(R)/ファイル・フィルタの変更..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
 msgid "/Remote/_Show selected"
 msgstr "/リモート(R)/選択したアイテムの表示"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 #, fuzzy
 msgid "/Remote/Select _All"
 msgstr "/リモート(R)/すべて選択"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/リモート(R)/全ファイル選択"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/リモート(R)/全選択解除"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/リモート(R)/フォルダ一覧の保存..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/リモート(R)/SITEコマンド送信..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 #, fuzzy
 msgid "/Remote/_Change Directory"
 msgstr "/リモート(R)/フォルダの変更"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 #, fuzzy
 msgid "/Remote/_Permisssions..."
 msgstr "/リモート(R)/アクセスモードの変更..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 #, fuzzy
 msgid "/Remote/_New Folder..."
 msgstr "/ファイル(_F)/新規フォルダ..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 #, fuzzy
 msgid "/Remote/Rena_me..."
 msgstr "/リモート(R)/名前の変更..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 #, fuzzy
 msgid "/Remote/_Delete..."
 msgstr "/リモート(R)/削除..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 #, fuzzy
 msgid "/Remote/_Edit..."
 msgstr "/リモート(R)/編集..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 #, fuzzy
 msgid "/Remote/_View..."
 msgstr "/リモート(R)/閲覧..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 #, fuzzy
 msgid "/Remote/_Refresh"
 msgstr "/リモート(R)/リフレッシュ"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/ブックマーク(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/ブックマーク(B)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/ブックマーク(B)/ブックマークへ追加"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/ブックマーク(B)/ブックマークの編集"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/ブックマーク(B)/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 #, fuzzy
 msgid "/_Transfer"
 msgstr "/転送(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 #, fuzzy
 msgid "/Transfer/tearoff"
 msgstr "/転送(T)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
 msgid "/Transfer/_Start"
 msgstr "/転送(T)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 #, fuzzy
 msgid "/Transfer/St_op"
 msgstr "/転送(T)/sep"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
 msgid "/Transfer/sep"
 msgstr "/転送(T)/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
 msgid "/Transfer/Skip _Current File"
 msgstr "/転送(T)/このファイルをスキップ"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
 msgid "/Transfer/_Remove File"
 msgstr "/転送(T)/ファイルの削除"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
 msgid "/Transfer/Move File _Up"
 msgstr "/転送(T)/ファイルを上に移動"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
 msgid "/Transfer/Move File _Down"
 msgstr "/転送(T)/ファイルを下に移動"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 #, fuzzy
 msgid "/Transfer/_Retrieve Files"
 msgstr "/転送(T)/ファイルの取得"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 #, fuzzy
 msgid "/Transfer/_Put Files"
 msgstr "/転送(T)/ファイルの送信"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 #, fuzzy
 msgid "/L_og"
 msgstr "/ログ(_O)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 #, fuzzy
 msgid "/Log/tearoff"
 msgstr "/ログ(O)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 #, fuzzy
 msgid "/Log/_Clear"
 msgstr "/ログ(O)/消去"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
 msgid "/Log/_View"
 msgstr "/ローカル(L)/閲覧..."
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
 msgid "/Log/_Save..."
 msgstr "/ログ(O)/ログの保存..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ツール(_S)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ツール(S)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 #, fuzzy
 msgid "/Tools/C_ompare Windows"
 msgstr "/ツール(S)/ウィンドウの比較"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 #, fuzzy
 msgid "/Tools/_Clear Cache"
 msgstr "/ツール(S)/キャッシュのクリア"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/ヘルプ"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/ヘルプ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 #, fuzzy
 msgid "/Help/_About"
 msgstr "/ヘルプ/情報"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "ホスト: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "ホスト(_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "ポート番号: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ユーザ: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ユーザ(_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "パスワード:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "コマンド: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ファイル名"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "サイズ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "日付"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "属性"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "経過"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "エラー: 接続先のホストを入力してください\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "リフレッシュ"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ユーザ名の入力"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "このサイトのユーザ名を入力してください"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "このサイトのパスワードを入力してください"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "処理がキャンセルされました...文字列を入力してください\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "新しいフォルダを作成します"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "作成するフォルダ名を入力してください"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rename"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%sを何に変更しますか"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "サイト"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "site-specific コマンドを入力してください"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "上書き"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "レジューム"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "スキップ"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "処理"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ファイルの転送"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2628,60 +2598,60 @@ msgstr ""
 "以下のファイルがローカルおよびリモート・コンピュータの両方に\n"
 "存在しています。どうすればよいのか選択してください。"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ファイルをスキップ"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "全選択"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "全選択解除"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "ファイルフィルタ変更: 処理がキャンセルされました...文字列を入力してください\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "ファイルフィルタ変更"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "エラー: %s を書き込みモードで開けません: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "フォルダ一覧を保存します"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "エラー: %s への書き込みにエラーがありました: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "ログファイルへ %s の書き込みが完了しました\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "ログの保存"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2690,11 +2660,11 @@ msgstr ""
 "ライセンス承諾ファイル COPYING が見つかりません。%s または %s の中を確認して"
 "ください。"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTPについて"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -2706,101 +2676,81 @@ msgstr ""
 "公式ホームページ: http://www.gftp.org/\n";
 "ロゴ提供: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "情報"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ライセンス承諾"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  閉じる  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "ウィンドウの比較"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "リモート・サーバから切断します"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (キャッシュ済) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "接続なし"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ファイル %s のオープンでエラー: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: リモート・サイトに接続していません\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 "%s: この失敗は、このプロトコルを使った利用でができないことによるものです\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: アイテムを一つだけ選択してください\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 "%s: アイテムを少なくとも一つ選択してください\n"
 "\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "変更"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "追加"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  はい  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  いいえ  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "フォルダ一覧を取得しています"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  停止  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2809,109 +2759,89 @@ msgstr ""
 "%ld 個のフォルダ\n"
 "%ld 個のファイルを受信済"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP エラー: ファイル %s が %s または %s の中にありません\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ホストの編集"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "ホストの追加"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "種類:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "種類(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ドメイン"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "ネットワーク・アドレス"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "ネットワーク・アドレス(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "ネットマスク"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "ネットマスク(_E):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ドメイン(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "ネットマスク"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "ローカル・ホスト"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "編集"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "オプション"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "適用"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ファイル名を取ってきています..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ファイル復旧: リモート・サイトへ接続していません\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "エラー: 子プロセス %d が %d を返しました\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "子プロセス %d は正常に終了しました\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "エラー: 子プロセス %d が正常終了しませんでした\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "エラー: ファイル %s の情報を取得できません: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ファイル %s は変更されませんでした\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2920,118 +2850,157 @@ msgstr ""
 "ファイル %s が変更されています。\n"
 "アップロードしますか?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ファイル編集"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "終了しました"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, fuzzy, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "受信 %s of %s (%.2fKバイト/秒)  推測残り時間=%02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "受信 %s of %s (%.2fKバイト/秒)  推測残り時間=%02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, fuzzy, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s (転送停止中) 推測残り時間=不明"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s (転送停止中) 推測残り時間=不明"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "?? %% 完了 (ファイル数 %ld/%ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 (ファイル数 %ld/%ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ファイル名を取ってきています... %s バイト"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "閲覧"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "編集"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "閲覧: もう一つ他のプロセスを fork できません: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "プログラムを実行しています: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s を %s で開いています\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ファイル %s を閲覧しています\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "閲覧: %s を開けません: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "制御端末 %s を開けません\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ユーザ名 [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s は既に存在します (転送元のサイズ %s, 転送先のサイズ %s):\n"
 "(o)上書き、(r)保留、(s)スキップ、(O)すべて上書き、(R)すべて保留、(S)すべてス"
 "キップ: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  キャンセル  "
+
+#~ msgid "Host: "
+#~ msgstr "ホスト: "
+
+#~ msgid "User: "
+#~ msgstr "ユーザ: "
+
+#~ msgid "  Close  "
+#~ msgstr "  閉じる  "
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
+#~ msgid "  Yes  "
+#~ msgstr "  はい  "
+
+#~ msgid "  No  "
+#~ msgstr "  いいえ  "
+
+#~ msgid "Type:"
+#~ msgstr "種類:"
+
+#~ msgid "Network Address"
+#~ msgstr "ネットワーク・アドレス"
+
+#~ msgid "_Edit"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "適用"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
@@ -3043,13 +3012,13 @@ msgstr ""
 
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr ""
-#~ "文字列 '%s' を現在のロケールから UTF に変換する際にエラーがありました: %"
-#~ "s\n"
+#~ "文字列 '%s' を現在のロケールから UTF に変換する際にエラーがありました: "
+#~ "%s\n"
 
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr ""
-#~ "文字列 '%s' を UTF から現在のロケールに変換する際にエラーがありました: %"
-#~ "s\n"
+#~ "文字列 '%s' を UTF から現在のロケールに変換する際にエラーがありました: "
+#~ "%s\n"
 
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 812f0e6..bc5d1e8 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,159 +6,161 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.master.kn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-05-20 07:03+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-07-13 11:04+0530\n"
 "Last-Translator: Shankar Prasad <svenkate redhat com>\n"
 "Language-Team: Kannada <en li org>\n"
+"Language: kn\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"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "ಅಮಾನ್ಯವಾದ URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ದೋಷ: ಕ್ಯಾಶೆ ಸೂಚಿ ಕಡತದಲ್ಲಿ ಅಮಾನ್ಯವಾದ ಸಾಲು %s ಇದೆ\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "ವಾಕ್ಯ '%s' ಅನ್ನು ಕ್ಯಾರೆಕ್ಟರ್ ಸೆಟ್ %s ಇಂದ ಕ್ಯಾರೆಕ್ಟರ್ ಸೆಟ್ %s ಬದಲಾಯಿಸಲಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ದೋಷ: ಸ್ಥಳೀಯ ಕಡತ %s ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ದೋಷ: ಸಾಕೆಟ್‌ಗೆ ಬರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ದೋಷ: ಸಾಕೆಟ್‌ನಿಂದ ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "ಎಚ್ಚರಿಕೆ: ಮಾಸ್ಟರ್ ಬುಕ್‌ಮಾರ್ಕ್ ಕಡತ %s ಕಂಡುಬಂದಿಲ್ಲ\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP ಎಚ್ಚರಿಕೆ: ಬುಕ್‌ಮಾರ್ಕ್ ಕಡತದಲ್ಲಿ ಸಾಲು %d ಅನ್ನು ಉಪೇಕ್ಷಿಸಲಾಗುತ್ತಿದೆ: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ಎಚ್ಚರಿಕೆ: ಸಾಲು %d ಸಾಕಷ್ಟು ಆರ್ಗುಮೆಂಟುಗಳನ್ನು ಹೊಂದಿಲ್ಲ\n"
 
-#: ../lib/config_file.c:504
+#: 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:507
+#: 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 ""
-"ext=file extenstion:XPM file:Ascii ಅಥವ Binary (A ಅಥವ B):viewer program. ಸೂಚನೆ: "
-"file extenstion ಒಂದನ್ನು ಹೊರತುಪಡಿಸಿ ಮಿಕ್ಕೆಲ್ಲವೂ ಐಚ್ಛಿಕ"
+"ext=file extenstion:XPM file:Ascii ಅಥವ Binary (A ಅಥವ B):viewer program. "
+"ಸೂಚನೆ: file extenstion ಒಂದನ್ನು ಹೊರತುಪಡಿಸಿ ಮಿಕ್ಕೆಲ್ಲವೂ ಐಚ್ಛಿಕ"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "ನೀವು ಒಂದು ಮೇಕ್ ಇನ್‌ಸ್ಟಾಲ್‌(make install) ಮಾಡಿದಿರೆ?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP ದೋಷ: ಸರಿಯಲ್ಲದ ದಾಖಲೆ ಕಡತದ ಹೆಸರು %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -166,581 +168,626 @@ msgstr ""
 "gFTP ಗಾಗಿನ ಬುಕ್‌ಮಾರ್ಕುಗಳ ಕಡತ. ಹಕ್ಕು (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. ಎಚ್ಚರಿಕೆ: ಈ ಕಡತಕ್ಕೆ ನೀವು ಸೇರಿಸುವ ಯಾವುದೆ ಟಿಪ್ಪಣಿಗಳನ್ನು ತಿದ್ದಿ ಬರೆಯಲಾಗುತ್ತದೆ"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
-msgstr "ಸೂಚನೆ: ಈ ಕಡತದಲ್ಲಿರುವ ಗುಪ್ತಪದಗಳನ್ನು ಕಲೆಸಿಡಲಾಗಿದೆ. ಈ ಅಲ್ಗಾರಿತಮ್ ಸುರಕ್ಷಿತವಾದುದಲ್ಲ. ನೀವು ಈ ಕಡತವನ್ನು 
ಸಂಪಾದಿಸುವಾಗ ನಿಮ್ಮ ಹಿಂದೆ ನಿಂತಿರುವವರು ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಸುಲಭವಾಗಿ ನೋಡವುದನ್ನು ತಪ್ಪಿಸಲು ಹೀಗೆ ಮಾಡಲಾಗಿದೆ. ಇದಕ್ಕೂ 
ಮೊದಲು ಎಲ್ಲಾ ಗುಪ್ತಪದಗಳನ್ನು ಸರಳ ಪಠ್ಯದಲ್ಲಿ ಇರಿಸಲಾಗುತ್ತಿತ್ತು."
+msgstr ""
+"ಸೂಚನೆ: ಈ ಕಡತದಲ್ಲಿರುವ ಗುಪ್ತಪದಗಳನ್ನು ಕಲೆಸಿಡಲಾಗಿದೆ. ಈ ಅಲ್ಗಾರಿತಮ್ ಸುರಕ್ಷಿತವಾದುದಲ್ಲ. "
+"ನೀವು ಈ ಕಡತವನ್ನು ಸಂಪಾದಿಸುವಾಗ ನಿಮ್ಮ ಹಿಂದೆ ನಿಂತಿರುವವರು ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಸುಲಭವಾಗಿ "
+"ನೋಡವುದನ್ನು ತಪ್ಪಿಸಲು ಹೀಗೆ ಮಾಡಲಾಗಿದೆ. ಇದಕ್ಕೂ ಮೊದಲು ಎಲ್ಲಾ ಗುಪ್ತಪದಗಳನ್ನು ಸರಳ ಪಠ್ಯದಲ್ಲಿ "
+"ಇರಿಸಲಾಗುತ್ತಿತ್ತು."
 
-#: ../lib/config_file.c:845
+#: 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:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ಅಜ್ಞಾತ>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ದೋಷ: ಕಡತ %s ಅನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ದೋಷ: ಕಡತ %s ಕ್ಕೆ ಬರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ದೋಷ: ಕಡತವನ್ನು ಮುಚ್ಚುವಲ್ಲಿ ದೋಷ: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP ಪರಿಚಾರಕ %s ದಿಂದ ಭ್ರಷ್ಟಗೊಂಡ ಕಡತ ಪಟ್ಟಿಯು ದೊರೆತಿದೆ\n"
 
-#: ../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
+#: 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 "ಗೊತ್ತಿರದ"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP ಕೋಶದ ಪಟ್ಟಿ %s ಅನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "ಕೋಶವನ್ನು %s ಗೆ ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "ಕೋಶವನ್ನು %s ಗೆ ಬದಲಾಯಿಸಲಾಗಲಿಲ್ಲ\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಲಾಗಿದೆ\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ದೋಷ: ಕಡತ %s ಅನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಲಿಲ್ಲ: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "FTPS ಅನ್ನು SSL ಬೆಂಬಲದೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಿರದ ಕಾರಣ ಅದು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ.\n"
+msgstr ""
+"FTPS ಅನ್ನು SSL ಬೆಂಬಲದೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಿರದ ಕಾರಣ ಅದು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು "
+"ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "HTTPS ಅನ್ನು SSL ಬೆಂಬಲದೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಿರದ ಕಾರಣ ಅದು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು 
ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ.\n"
+msgstr ""
+"HTTPS ಅನ್ನು SSL ಬೆಂಬಲದೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಿರದ ಕಾರಣ ಅದು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು "
+"ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "ಪ್ರಸಕ್ತ ಕಾರ್ಯ ನಿರ್ವಹಿಸುತ್ತಿರುವ ಕೋಶವನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "ಸ್ಥಳೀಯ ಕೋಶವನ್ನು %s ಗೆ ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "ಸ್ಥಳೀಯ ಕೋಶವನ್ನು %s ಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ದೋಷ: ಸ್ಥಳೀಯ ಕಡತ %s ಅನ್ನು ಮೊಟಕುಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "ಸ್ಥಳೀಯ ಕೋಶ ಪಟ್ಟಿ %s ಅನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ನ ಕ್ರಮವನ್ನು %o ಗೆ ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ದೋಷ: %s ನ ಕ್ರಮವನ್ನು %o ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s ನ ಸಮಯ ಮುದ್ರೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ದೋಷ: %s ನ ಸಮಯ ಮುದ್ರೆಯನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ಸ್ಥಳೀಯ ಕಡತ ವ್ಯವಸ್ಥೆ"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ಬಳಕೆ: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ಯಾವುದು ಇಲ್ಲ"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ಕಡತ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "ಗಾತ್ರ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ಬಳಕೆದಾರ"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "ಗುಂಪು"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "ದಿನಾಂಕಸಮಯ"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "ಗುಣವಿಶೇಷಗಳು"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "ಇಳಿಕೆ ಕ್ರಮ"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ಏರಿಕೆ ಕ್ರಮ"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ನೋಡು:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
-msgstr "ಕಡತಗಳನ್ನು ನೋಡಲು ಬಳಸಲಾಗುವ ಪೂರ್ವನಿಯೋಜಿತ ಕಡತಗಳು. ಇದು ಖಾಲಿ ಇದ್ದಲ್ಲಿ, ಆಂತರಿಕ ಕಡತ ವೀಕ್ಷಕವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"
+msgstr ""
+"ಕಡತಗಳನ್ನು ನೋಡಲು ಬಳಸಲಾಗುವ ಪೂರ್ವನಿಯೋಜಿತ ಕಡತಗಳು. ಇದು ಖಾಲಿ ಇದ್ದಲ್ಲಿ, ಆಂತರಿಕ ಕಡತ "
+"ವೀಕ್ಷಕವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ಸಂಪಾದಿಸು:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸಲು ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಗ್ರಾಮ್‌."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "ದಾಖಲೆ ವಿಂಡೋದ ಗರಿಷ್ಟ ಗಾತ್ರ:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ ಸಂಪರ್ಕಸ್ಥಾನಕ್ಕಾಗಿ ದಾಖಲೆ ವಿಂಡೋದ ಗರಿಷ್ಟ ಗಾತ್ರ, ಬೈಟ್‌ಗಳಲ್ಲಿ"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "ದೂರಸ್ಥ ಕ್ಯಾರೆಕ್ಟರ್ ಸೆಟ್‌ಗಳು:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 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
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "ದೂರಸ್ಥ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ಮೌಲ್ಯವಾಗಿದೆ. ಕೋಶದ ಪಟ್ಟಿಯಲ್ಲಿ ದಿನಾಂಕಗಳನ್ನು ಸೂಕ್ತವಾಗಿ ಪಾರ್ಸ್ ಮಾಡುವಂತೆ 
ಇದು ಇರುತ್ತದೆ."
+msgstr ""
+"ಇದು ದೂರಸ್ಥ ತಾಣಕ್ಕಾಗಿನ LC_TIME ಮೌಲ್ಯವಾಗಿದೆ. ಕೋಶದ ಪಟ್ಟಿಯಲ್ಲಿ ದಿನಾಂಕಗಳನ್ನು ಸೂಕ್ತವಾಗಿ "
+"ಪಾರ್ಸ್ ಮಾಡುವಂತೆ ಇದು ಇರುತ್ತದೆ."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "ಕ್ಯಾಶೆ TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
-msgstr "ಕ್ಯಾಶೆಯಲ್ಲಿನ ನಮೂದುಗಳ ವಾಯಿದೆಯು ತೀರುವ ಮೊದಲು ಅವನ್ನು ಇರಿಸಿಕೊಳ್ಳಬೇಕಿರುವ ಸೆಕೆಂಡುಗಳು."
+msgstr ""
+"ಕ್ಯಾಶೆಯಲ್ಲಿನ ನಮೂದುಗಳ ವಾಯಿದೆಯು ತೀರುವ ಮೊದಲು ಅವನ್ನು ಇರಿಸಿಕೊಳ್ಳಬೇಕಿರುವ ಸೆಕೆಂಡುಗಳು."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆಗಳಿಗೆ ಸೇರಿಸು"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ಈಗಿರು ಕಡತ ವರ್ಗಾವಣೆಗಳಿಗೆ ಹೊಸತೊಂದನ್ನು ಸೇರಿಸು"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ಒಮ್ಮೆಗೆ ಒಂದನ್ನು ಮಾತ್ರ ವರ್ಗಾಯಿಸು"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದನ್ನು ವರ್ಗಾಯಿಸಬೇಕೆ?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ತಿದ್ದಿಬರೆ"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "ಕಡತಗಳನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ತಿದ್ದಿಬರೆ ಅಥವ ಕಡತದ ವರ್ಗಾವಣೆಗಳನ್ನು ಮರಳಿ ಆರಂಭಿಸುವಂತೆ ಹೊಂದಿಸಿ"
+msgstr ""
+"ಕಡತಗಳನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ತಿದ್ದಿಬರೆ ಅಥವ ಕಡತದ ವರ್ಗಾವಣೆಗಳನ್ನು ಮರಳಿ ಆರಂಭಿಸುವಂತೆ "
+"ಹೊಂದಿಸಿ"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ಕಡತದ ಅನುಮತಿಗಳನ್ನು ಹಾಗೆ ಉಳಿಸಿಕೊ"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "ವರ್ಗಾಯಿಸಲಾದ ಕಡತದ ಅನುಮತಿಗಳನ್ನು ಹಾಗೆ ಉಳಿಸಿಕೊ"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ಕಡತದ ಸಮಯಗಳನ್ನು ಹಾಗೆ ಉಳಿಸಿಕೊ"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "ವರ್ಗಾಯಿಸಲಾದ ಕಡತದ ಸಮಯಗಳನ್ನು ಹಾಗೆ ಉಳಿಸಿಕೊ"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ಪ್ರತಿ ಕಡತ ವರ್ಗಾವಣೆಯ ನಂತರ ಪುನಶ್ಚೇತನಗೊಳಿಸು"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ಪ್ರತಿಯೊಂದು ಕಡತ ವರ್ಗಾವಣೆಯ ನಂತರ ಪಟ್ಟಿಚೌಕವನ್ನು ಪುನಶ್ಚೇತನಗೊಳಿಸು"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ಕೋಶಗಳನ್ನು ಮೊದಲಿರುವಂತೆ ವಿಂಗಡಿಸು"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "ಕಡತಗಳನ್ನು ಮೊದಲು ಇರಿಸು ನಂತರ ಕೋಶಗಳನ್ನು ಇರಿಸು"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "ಅಡಗಿಸಲಾದ ಕಡತಗಳನ್ನು ತೋರಿಸು"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿ ಅಡಗಿಸಲಾದ ಕಡತಗಳನ್ನು ತೋರಿಸು"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "ಶೀರ್ಷಿಕೆಯಲ್ಲಿ ವರ್ಗಾವಣೆಯ ಸ್ಥಿತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "ಶೀರ್ಷಿಕೆ ಪಟ್ಟಿಯಲ್ಲಿ ಕಡತ ವರ್ಗಾವಣೆಯ ಸ್ಥಿತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲು ಆರಂಭಿಸು"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "ಕಡತಗಳು ಸರತಿಯಲ್ಲಿ ಬಂದಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅವುಗಳ ವರ್ಗಾವಣೆಯನ್ನು ಆರಂಭಿಸು"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI ಯಲ್ಲಿ ಕೈಯಾರೆ ಆಜ್ಞೆಗಳನ್ನು ಚಲಾಯಿಸುವುದನ್ನು ಅನುಮತಿಸು"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr "GUI ಯಲ್ಲಿ ಕೈಯಾರೆ ಆಜ್ಞೆಗಳನ್ನು ನಮೂದಿಸುವುದನ್ನು ಅನುಮತಿಸು (ಪಠ್ಯ ಸಂಪರ್ಕಸ್ಥಾನದಂತಹ ಕ್ರಿಯೆಗಳು)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+"GUI ಯಲ್ಲಿ ಕೈಯಾರೆ ಆಜ್ಞೆಗಳನ್ನು ನಮೂದಿಸುವುದನ್ನು ಅನುಮತಿಸು (ಪಠ್ಯ ಸಂಪರ್ಕಸ್ಥಾನದಂತಹ ಕ್ರಿಯೆಗಳು)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "ಕೊನೆಯ ಕೋಶವನ್ನು ನೆನಪಿಟ್ಟುಕೊ"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "ಅನ್ವಯವನ್ನು ಮುಚ್ಚಿದಾಗ ಕೊನೆಯ ಸ್ಥಳೀಯ ಹಾಗು ದೂರಸ್ಥ ಕೋಶವನ್ನು ಉಳಿಸು"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "ಆರಂಭಗೊಂಡಾಗ ದೂರಸ್ಥ ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸು"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "ಅನ್ವಯವು ಆರಂಭಗೊಂಡಾಗ ದೂರಸ್ಥ ಪರಿಚಾರಕಕ್ಕೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ ಕಲ್ಪಿಸು."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "ಜಾಲಬಂಧ"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "ಜಾಲಬಂಧ ಕಾಲಾವಧಿ ಮೀರಿಕೆ:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "ಜಾಲಬಂಧ ಇನ್‌ಪುಟ್/ಔಟ್‌ಪುಟ್‌ಗೆ ಕಾಯುತ್ತಿರುವ ಕಾಲಾವಧಿ ಮೀರಿಕೆ. ಇದು ಒಂದು ಜಡ ಕಾಲಾವಧಿ ಮೀರಿಕೆಯಾಗಿರುವುದಿಲ್ಲ."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"ಜಾಲಬಂಧ ಇನ್‌ಪುಟ್/ಔಟ್‌ಪುಟ್‌ಗೆ ಕಾಯುತ್ತಿರುವ ಕಾಲಾವಧಿ ಮೀರಿಕೆ. ಇದು ಒಂದು ಜಡ ಕಾಲಾವಧಿ "
+"ಮೀರಿಕೆಯಾಗಿರುವುದಿಲ್ಲ."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "ಸಂಪರ್ಕದ ಮರುಪ್ರಯತ್ನಗಳು:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "ನಡೆಸಬೇಕಿರುವ ಸ್ವಯಂ-ಮರಳಿ ಪ್ರಯತ್ನಗಳ ಸಂಖ್ಯೆ. ಪದೆ ಪದೆ ಮರು ಪ್ರಯತ್ನಗಳನ್ನು ನಡೆಸಲು ಇದನ್ನು 0 ಗೆ ಹೊಂದಿಸಿ"
+msgstr ""
+"ನಡೆಸಬೇಕಿರುವ ಸ್ವಯಂ-ಮರಳಿ ಪ್ರಯತ್ನಗಳ ಸಂಖ್ಯೆ. ಪದೆ ಪದೆ ಮರು ಪ್ರಯತ್ನಗಳನ್ನು ನಡೆಸಲು ಇದನ್ನು 0 "
+"ಗೆ ಹೊಂದಿಸಿ"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "ಮರು-ಪ್ರಯತ್ನದ ನಡುವಿನ ಜಡ ಸಮಯ:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "ಎರಡು ಮರಳಿ ಪ್ರಯತ್ನಗಳ ಕಾಯಬೇಕಿರುವ ಸೆಕೆಂಡುಗಳು"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "ಗರಿಷ್ಟ KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "ಒಂದು ಕಡತದ ವರ್ಗಾವಣೆಯು ಪಡೆಯಬಹುದಾದ ಗರಿಷ್ಟ KB/s. (ಅಶಕ್ತಗೊಳಿಸಲು 0 ಗೆ ಹೊಂದಿಸಿ)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "ವರ್ಗಾವಣೆ ಖಂಡ ಗಾತ್ರ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "ಕಡತಗಳನ್ನು ವರ್ಗಾಯಿಸುವಾಗ ಬಳಸಲಾಗುವ ಖಂಡದ ಗಾತ್ರ. ಇದು 1024ನ ಒಂದು ಗುಣಕವಾಗಿರಬೇಕು."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಟೋಕಾಲ್:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "ಇದು ಬಳಸಬೇಕಿರುವ ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಟೋಕಾಲ್ ಅನ್ನು ಸೂಚಿಸುತ್ತದೆ"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 ಬೆಂಬಲವನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತದೆ"
+msgstr ""
+"ಕಡತ ಪಟ್ಟಿಚೌಕದಲ್ಲಿನ ಒಂದು ಕಡತದ ಮೇಲೆ ನೀವು ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿದಾಗ ಏನಾಗುತ್ತದೆ "
+"ಎನ್ನುವುದನ್ನು ಸೂಚಿಸುತ್ತದೆ. 0=ಕಡತವನ್ನು ನೋಡಲಾಗುತ್ತದೆ 1=ಕಡತವನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತದೆ "
+"2=ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತದೆ"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ಸ್ಥಳೀಯ ಕಡತಗಳ ಪಟ್ಟಿಚೌಕದ ಪೂರ್ವನಿಯೋಜಿತ ಅಗಲ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "ದೂರಸ್ಥ ಕಡತಗಳ ಪಟ್ಟಿಚೌಕದ ಪೂರ್ವನಿಯೋಜಿತ ಅಗಲ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ಸ್ಥಳೀಯ/ದೂರಸ್ಥ ಕಡತಗಳ ಪಟ್ಟಿಚೌಕಗಳ ಪೂರ್ವನಿಯೋಜಿತ ಎತ್ತರ"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "ವರ್ಗಾವಣೆ ಪಟ್ಟಿಚೌಕದ ಪೂರ್ವನಿಯೋಜಿತ ಎತ್ತರ"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "ದಾಖಲಿಸುವ ವಿಂಡೋದ ಪೂರ್ವನಿಯೋಜಿತ ಎತ್ತರ"
 
-#: ../lib/options.h:177
+#: 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
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ವಿಂಗಡಿಸಬೇಕಿರುವ ಪೂರ್ವನಿಯೋಜಿತ ಲಂಬಸಾಲು"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ಇಳಿಕೆಕ್ರಮದಲ್ಲಿ ಅಥವ ಏರಿಕೆಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸು"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ಕಡತದ ಹೆಸರಿನ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ "
+"ಹೊಂದಲು ಈ ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ಗಾತ್ರ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ ಹೊಂದಲು ಈ "
+"ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ಬಳಕೆದಾರ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ "
+"ಹೊಂದಲು ಈ ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ಗುಂಪಿನ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ ಹೊಂದಲು "
+"ಈ ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ದಿನಾಂಕದ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ "
+"ಹೊಂದಲು ಈ ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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 ಗೆ ಬದಲಾಯಿಸಿ"
+msgstr ""
+"ಕಡತದ ಪಟ್ಟಿಚೌಕಗಳಲ್ಲಿನ ಗುಣವಿಶೇಷ ಲಂಬಸಾಲಿನ ಅಗಲ. ಇದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಾತ್ರ ಬದಲಾವಣೆ "
+"ಹೊಂದಲು ಈ ಮೌಲ್ಯವನ್ನು 0 ಹೊಂದಿಸಿ. ಈ ಲಂಬಸಾಲನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು -1 ಗೆ ಬದಲಾಯಿಸಿ"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "ಪರಿಚಾರಕಕ್ಕೆ ಕಳುಹಿಸಲಾದ ಆಜ್ಞೆಗಳ ಬಣ್ಣ"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಪಡೆಯಲಾದ ಆಜ್ಞೆಗಳ ಬಣ್ಣ"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ದಾಖಲೆ ಸಂದೇಶಗಳ ಬಣ್ಣ"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "ಮಿಕ್ಕುಳಿದ ದಾಖಲೆ ಸಂದೇಶಗಳ ಬಣ್ಣ"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "ಸ್ಥಳೀಯ"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "ಬುಕ್‍ಮಾರ್ಕ್"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆಯ ವೇಗವನ್ನು %.2f KB/s ಗೆ ಹೆಚ್ಚಿಸಲಾಗುತ್ತದೆ\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
-msgstr "LC_TIME ಅನ್ನು '%s' ಗೆ ಹೊಂದಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. '%s' ಗೆ ಹಿಮ್ಮರಳಲಾಗುತ್ತಿದೆ\n"
+msgstr ""
+"LC_TIME ಅನ್ನು '%s' ಗೆ ಹೊಂದಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. '%s' ಗೆ ಹಿಮ್ಮರಳಲಾಗುತ್ತಿದೆ\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "ಕ್ಯಾಶೆಯಿಂದ ಕೋಶದ ಪಟ್ಟಿ %s ಅನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಕೋಶದ ಪಟ್ಟಿ %s ಅನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -749,108 +796,112 @@ msgstr ""
 "ಎಚ್ಚರಿಕೆ: ಕಡತ '%s' ದ ಮಾರ್ಗವನ್ನು ಹೊರತೆಗೆಯಲಾಗುತ್ತಿದೆ. ಹೊರತೆಗೆಯಲಾದ ಮಾರ್ಗವು (%s) "
 "ಪ್ರಸಕ್ತ ಕೋಶಕ್ಕೆ (%s) ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ದೋಷ: ಕ್ಯಾಶೆಗೆ ಬರೆಯಲಾಗಲಿಲ್ಲ: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ದೋಷ: ಬುಕ್‌ ಮಾರ್ಕ್ %s ಕಂಡುಬಂದಿಲ್ಲ\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳ ದೋಷ: ಬುಕ್‌ಮಾರ್ಕು ನಮೂದು %s ಒಂದು ಅತಿಥೇಯದ ಹೆಸರನ್ನು ಹೊಂದಿಲ್ಲ\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "ಪ್ರೊಟೊಕಾಲ್ '%s' ಪ್ರಸಕ್ತ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "ಪುನರಾವರ್ತಿತ ಸಾಂಕೇತಿಕ ಕೊಂಡಿ %s ಕಂಡುಬಂದಿದೆ\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "ದೋಷ: ದೂರಸ್ಥ ತಾಣ %s ದಿಂದ ಸಂಪರ್ಕ ಕಡಿದಿದೆ. ಗರಿಷ್ಟ ಮರಳಿ ಪ್ರಯತ್ನಗಳು ಮುಗಿದಿವೆ...ಬಿಟ್ಟು ಬಿಡಲಾಗುತ್ತಿದೆ\n"
+msgstr ""
+"ದೋಷ: ದೂರಸ್ಥ ತಾಣ %s ದಿಂದ ಸಂಪರ್ಕ ಕಡಿದಿದೆ. ಗರಿಷ್ಟ ಮರಳಿ ಪ್ರಯತ್ನಗಳು ಮುಗಿದಿವೆ...ಬಿಟ್ಟು "
+"ಬಿಡಲಾಗುತ್ತಿದೆ\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "ದೋಷ: ದೂರಸ್ಥ ತಾಣ %s ದಿಂದ ಸಂಪರ್ಕ ಕಡಿದಿದೆ. %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮರಳಿ ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗುತ್ತದೆ\n"
+msgstr ""
+"ದೋಷ: ದೂರಸ್ಥ ತಾಣ %s ದಿಂದ ಸಂಪರ್ಕ ಕಡಿದಿದೆ. %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮರಳಿ ಸಂಪರ್ಕ "
+"ಜೋಡಿಸಲಾಗುತ್ತದೆ\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "ಮಾಸ್ಟರ್ pty %s ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ಸಾಕೆಟ್ ಜೋಡಿಯೊಂದನ್ನು ನಿರ್ಮಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ದೋಷ: ssh ಅನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "ಬೇರೊಂದು ಪ್ರಕ್ರಿಯೆಯನ್ನು ವಿಭಜಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಅತಿಥೇಯದ ಹೆಸರು:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ಫೈರ್ವಾಲ್ ಅತಿಥೇಯದ ಹೆಸರು"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಸಂಪರ್ಕಸ್ಥಾನ:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ಫೈರ್ವಾಲಿನಲ್ಲಿ ಸಂಪರ್ಕಜೋಡಿಸಬೇಕಿರುವ ಸಂಪರ್ಕಸ್ಥಾನ"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಬಳಕೆದಾರ ಹೆಸರು:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ನಿಮ್ಮ ಫೈರ್ವಾಲ್ ಬಳಕೆದಾರ ಹೆಸರು"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಗುಪ್ತಪದ:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ನಿಮ್ಮ ಫೈರ್ವಾಲ್ ಗುಪ್ತಪದ"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 ಅನ್ನು ಬಳಸು"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -859,83 +910,85 @@ msgstr ""
 "ಪರಿಚಾರಕದಿಂದ ಒಂದು ತಪ್ಪಾದ ಪ್ರತ್ಯುತ್ತರವು ಬಂದಿದೆ, ಸಂಪರ್ಕ ಕಡಿಯಲಾಗುತ್ತಿದೆ\n"
 "ದೂರಸ್ಥ ಪರಿಚಾರಕದಿಂದ ಅಮಾನ್ಯವಾದ ತುಣುಕಗಳ ಗಾತ್ರ '%s' ಮರಳಿಸಿಲಾಗಿದೆ\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ಆಫ್‌ಸೆಟ್‌ನಲ್ಲಿ ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ಕಡತ %s ಅನ್ನು ಹಿಂಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ಕೋಶದ ಪಟ್ಟಿಯನ್ನು ಹಿಂದಕ್ಕೆ ಪಡೆಯಲಾಗುತ್ತಿದೆ...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಒಂದು ತಪ್ಪಾದ ಪ್ರತ್ಯುತ್ತರವು ಬಂದಿದೆ, ಸಂಪರ್ಕ ಕಡಿಯಲಾಗುತ್ತಿದೆ\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE ಆಜ್ಞೆ"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP ಪ್ರಾಕ್ಸಿ"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "ಇಚ್ಛೆಯ"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ಇಮೈಲ್ ವಿಳಾಸ:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 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
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಖಾತೆ:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ನಿಮ್ಮ ಫೈರ್ವಾಲ್ ಖಾತೆ (ಐಚ್ಛಿಕ)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕದ ಬಗೆ:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -945,27 +998,34 @@ msgid ""
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
 msgstr ""
-"ಇದು ನಿಮ್ಮ ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕಕ್ಕೆ ನಾವು ಹೇಗೆ ಪ್ರವೇಶಿಸಲು ಅಪೇಕ್ಷಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಸೂಚಿಸುತ್ತದೆ. ನೀವು ಒಂದು "
-"% ಅನ್ನು ಹೊಂದಿರುವ ಎರಡು ಅಕ್ಷರಗಳ ಒಂದು ಬದಲಿ ನಮೂದನ್ನು ಬಳಸಿ ಇದು ಸೂಕ್ತವಾದ ದತ್ತಾಂಶದಿಂದ ಬದಲಾಯಿಸಲ್ಪಡುತ್ತದೆ. ಮೊದಲ 
ಅಕ್ಷರವನ್ನು FTP ಪರಿಚಾರಕದ ಪ್ರಾಕ್ಸಿಗಾಗಿ p ಅಥವ ಅತಿಥೇಯಕ್ಕಾಗಿನ h ಇಂದ ಬದಲಾಯಿಸಿ. ಎರಡನೆ ಅಕ್ಷರವು u (ಬಳಕೆದಾರ), p (ಪಾಸ್), 
h "
-"(ಅತಿಥೇಯ), o (ಸಂಪರ್ಕಸ್ಥಾನ) ಅಥವ a (ಖಾತೆ) ಆಗಿರುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಪ್ರಾಕ್ಸಿ ಬಳಕೆದಾರನಿಗಾಗಿ, ನೀವು %pu ಎಂದು 
ನಮೂದಿಸಬಹುದು"
-
-#: ../lib/rfc959.c:69
+"ಇದು ನಿಮ್ಮ ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕಕ್ಕೆ ನಾವು ಹೇಗೆ ಪ್ರವೇಶಿಸಲು ಅಪೇಕ್ಷಿಸುತ್ತದೆ ಎಂಬುದನ್ನು "
+"ಸೂಚಿಸುತ್ತದೆ. ನೀವು ಒಂದು % ಅನ್ನು ಹೊಂದಿರುವ ಎರಡು ಅಕ್ಷರಗಳ ಒಂದು ಬದಲಿ ನಮೂದನ್ನು ಬಳಸಿ ಇದು "
+"ಸೂಕ್ತವಾದ ದತ್ತಾಂಶದಿಂದ ಬದಲಾಯಿಸಲ್ಪಡುತ್ತದೆ. ಮೊದಲ ಅಕ್ಷರವನ್ನು FTP ಪರಿಚಾರಕದ ಪ್ರಾಕ್ಸಿಗಾಗಿ p "
+"ಅಥವ ಅತಿಥೇಯಕ್ಕಾಗಿನ h ಇಂದ ಬದಲಾಯಿಸಿ. ಎರಡನೆ ಅಕ್ಷರವು u (ಬಳಕೆದಾರ), p (ಪಾಸ್), h "
+"(ಅತಿಥೇಯ), o (ಸಂಪರ್ಕಸ್ಥಾನ) ಅಥವ a (ಖಾತೆ) ಆಗಿರುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಪ್ರಾಕ್ಸಿ "
+"ಬಳಕೆದಾರನಿಗಾಗಿ, ನೀವು %pu ಎಂದು ನಮೂದಿಸಬಹುದು"
+
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ವಿಳಾಸವನ್ನು ಆಲಕ್ಷಿಸು"
 
-#: ../lib/rfc959.c:72
+#: 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 "ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ದೂರಸ್ಥ FTP ಪರಿಚಾರಕದ PASV IP ವಿಳಾಸದ ಸ್ಥಳವನ್ನು ಆಲಕ್ಷಿಸಲಾಗುವುದು ಹಾಗು ಅದರ ಬದಲಿಗೆ 
ಅತಿಥೇಯದ IP ವಿಳಾಸವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ. ಇದು ಹೆಚ್ಚಾಗಿ ಒಂದು PASV ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಹೊರಗಿನ IP ಯ ಬದಲು ಒಳಗಿನ IP ಅನ್ನು 
ನೀಡುವ ರೌಟರುಗಳಿಗೆ ಅಗತ್ಯವಿರುತ್ತದೆ."
+msgstr ""
+"ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ದೂರಸ್ಥ FTP ಪರಿಚಾರಕದ PASV IP ವಿಳಾಸದ ಸ್ಥಳವನ್ನು "
+"ಆಲಕ್ಷಿಸಲಾಗುವುದು ಹಾಗು ಅದರ ಬದಲಿಗೆ ಅತಿಥೇಯದ IP ವಿಳಾಸವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ. ಇದು ಹೆಚ್ಚಾಗಿ "
+"ಒಂದು PASV ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಹೊರಗಿನ IP ಯ ಬದಲು ಒಳಗಿನ IP ಅನ್ನು ನೀಡುವ ರೌಟರುಗಳಿಗೆ "
+"ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "ಜಡ ಕಡತ ವರ್ಗಾವಣೆಗಳು"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -973,397 +1033,411 @@ msgid ""
 "to an older FTP server that doesn't support this. If this is disabled, then "
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
-msgstr "ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ದೂರಸ್ಥ FTP ಪರಿಚಾರಕವು ದತ್ತಾಂಶ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಒಂದು ಸಂಪರ್ಕಸ್ಥಾನವನ್ನು ತೆರೆಯುತ್ತದೆ. 
ನೀವು ಒಂದು ಫೈರ್ವಾಲಿನ ಹಿಂದೆ ಇದ್ದಲ್ಲಿ, ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ. ಸಾಮಾನ್ಯವಾಗಿ, ಇದನ್ನು ಬೆಂಬಲಿಸದೆ ಇರುವ ಒಂದು ಹಳೆಯ 
FTP ಪರಿಚಾರಕದೊಂದಿಗೆ ನೀವು ಸಂಪರ್ಕ ಸಾಧಿಸುವ ಉದ್ದೇಶವಿರದೆ ಇರದ ಪಕ್ಷದಲ್ಲಿ ಇದನ್ನು ಶಕ್ತವಾಗಿಡುವುದು ಉತ್ತಮ. ಇದು 
ಅಶಕ್ತವಾಗಿದ್ದಲ್ಲಿ, gFTP ಯು ಕ್ಲೈಂಟ್‌ನಲ್ಲಿ ಒಂದು ಸಂಪರ್ಕಸ್ಥಾನ
 ವನ್ನು ತೆರೆಯುತ್ತದೆ ಹಾಗು ದೂರಸ್ಥ ಪರಿಚಾಕವು ಅದರ ಮೂಲಕ ಸಂಪರ್ಕ ಹೊಂದಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ."
-
-#: ../lib/rfc959.c:79
+msgstr ""
+"ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ದೂರಸ್ಥ FTP ಪರಿಚಾರಕವು ದತ್ತಾಂಶ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಒಂದು "
+"ಸಂಪರ್ಕಸ್ಥಾನವನ್ನು ತೆರೆಯುತ್ತದೆ. ನೀವು ಒಂದು ಫೈರ್ವಾಲಿನ ಹಿಂದೆ ಇದ್ದಲ್ಲಿ, ಇದನ್ನು "
+"ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ. ಸಾಮಾನ್ಯವಾಗಿ, ಇದನ್ನು ಬೆಂಬಲಿಸದೆ ಇರುವ ಒಂದು ಹಳೆಯ FTP "
+"ಪರಿಚಾರಕದೊಂದಿಗೆ ನೀವು ಸಂಪರ್ಕ ಸಾಧಿಸುವ ಉದ್ದೇಶವಿರದೆ ಇರದ ಪಕ್ಷದಲ್ಲಿ ಇದನ್ನು ಶಕ್ತವಾಗಿಡುವುದು "
+"ಉತ್ತಮ. ಇದು ಅಶಕ್ತವಾಗಿದ್ದಲ್ಲಿ, gFTP ಯು ಕ್ಲೈಂಟ್‌ನಲ್ಲಿ ಒಂದು ಸಂಪರ್ಕಸ್ಥಾನವನ್ನು ತೆರೆಯುತ್ತದೆ "
+"ಹಾಗು ದೂರಸ್ಥ ಪರಿಚಾಕವು ಅದರ ಮೂಲಕ ಸಂಪರ್ಕ ಹೊಂದಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ."
+
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "ದೂರಸ್ಥ ಸಿಮ್‌ಲಿಂಕ್‌ಗಳನ್ನು ಪರಿಹರಿಸು (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
-msgstr "ದೂರಸ್ಥ FTP ಪರಿಚಾರಕವು ಕೋಶ ಪಟ್ಟಿಗಳಲ್ಲಿ ಸಿಮ್‌ಲಿಂಕುಗಳನ್ನು ಪರಿಹರಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ. ಸಾಮಾನ್ಯವಾಗಿ, ಇದನ್ನು 
ಶಕ್ತವಾಗಿಯೆ ಇರಿಸುವುದು ಉತ್ತಮ. ಎಲ್ಲಿಯಾದರೂ FTP ಪರಿಚಾರಕವು LIST ಮಾಡಲು -L ಆಯ್ಕೆಯನ್ನು ಬೆಂಬಲಿಸದೆ ಇದ್ದಲ್ಲಿ ನೀವು ಇದನ್ನು 
ಅಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ"
+msgstr ""
+"ದೂರಸ್ಥ FTP ಪರಿಚಾರಕವು ಕೋಶ ಪಟ್ಟಿಗಳಲ್ಲಿ ಸಿಮ್‌ಲಿಂಕುಗಳನ್ನು ಪರಿಹರಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ. "
+"ಸಾಮಾನ್ಯವಾಗಿ, ಇದನ್ನು ಶಕ್ತವಾಗಿಯೆ ಇರಿಸುವುದು ಉತ್ತಮ. ಎಲ್ಲಿಯಾದರೂ FTP ಪರಿಚಾರಕವು LIST "
+"ಮಾಡಲು -L ಆಯ್ಕೆಯನ್ನು ಬೆಂಬಲಿಸದೆ ಇದ್ದಲ್ಲಿ ನೀವು ಇದನ್ನು ಅಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ಕಡತಗಳನ್ನು ASCII ಕ್ರಮದಲ್ಲಿ ವರ್ಗಾಯಿಸು"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
-msgstr "ನೀವು ಒಂದು ಪಠ್ಯ ಕಡತವನ್ನು ಒಂದು ವಿಂಡೋಸ್ ಅಥವ UNIX ಗಣಕದಿಂದ ಅಥವ ಗಣಕಕ್ಕೆ ವರ್ಗಾಯಿಸುವಂತಿದ್ದರೆ, ನೀವು ಇದನ್ನು 
ಶಕ್ತಗೊಳಿಸಬೇಕು. ಪ್ರತಿ ವ್ಯವಸ್ಥೆಗಳೂ ಪಠ್ಯ ಕಡತಗಳಿಗೆ ಪ್ರತ್ಯೇಕವಾದ ಹೊಸ ಸಾಲುಗಳನ್ನು ಸೂಚಿಸುತ್ತವೆ. ಎಲ್ಲಿಯಾದರೂ ನೀವು UNIX 
ನಿಂದ UNIX ಗೆ ವರ್ಗಾಯಿಸುತ್ತಿದ್ದರೆ, ಇದನ್ನು ಆಫ್‌ ಮಾಡಿ. ನೀವು ಬೈನರಿ ದತ್ತಾಂಶವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿಕೊಳ್ಳುತ್ತಿದ್ದಲ್ಲಿ, 
ನೀವು ಇದನ್ನು ಅಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ."
+msgstr ""
+"ನೀವು ಒಂದು ಪಠ್ಯ ಕಡತವನ್ನು ಒಂದು ವಿಂಡೋಸ್ ಅಥವ UNIX ಗಣಕದಿಂದ ಅಥವ ಗಣಕಕ್ಕೆ "
+"ವರ್ಗಾಯಿಸುವಂತಿದ್ದರೆ, ನೀವು ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕು. ಪ್ರತಿ ವ್ಯವಸ್ಥೆಗಳೂ ಪಠ್ಯ ಕಡತಗಳಿಗೆ "
+"ಪ್ರತ್ಯೇಕವಾದ ಹೊಸ ಸಾಲುಗಳನ್ನು ಸೂಚಿಸುತ್ತವೆ. ಎಲ್ಲಿಯಾದರೂ ನೀವು UNIX ನಿಂದ UNIX ಗೆ "
+"ವರ್ಗಾಯಿಸುತ್ತಿದ್ದರೆ, ಇದನ್ನು ಆಫ್‌ ಮಾಡಿ. ನೀವು ಬೈನರಿ ದತ್ತಾಂಶವನ್ನು ಡೌನ್‌ಲೋಡ್ "
+"ಮಾಡಿಕೊಳ್ಳುತ್ತಿದ್ದಲ್ಲಿ, ನೀವು ಇದನ್ನು ಅಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "'%s' PASV ಪ್ರತ್ಯುತ್ತರದಲ್ಲಿನ IP ವಿಳಾಸವನ್ನು ಪತ್ತೆ ಮಾಡಲಾಗಿಲ್ಲ\n"
 
-#: ../lib/rfc959.c:775
+#: 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:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ದತ್ತಾಂಶ ಸಂಪರ್ಕವನ್ನು ನಿರ್ಮಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ಒಂದು ಸಂಪರ್ಕಸ್ಥಾನಕ್ಕೆ ಬೈಂಡ್ ಆಗಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "ಒಂದು IPv6 ಸಾಕೆಟ್‌ ಅನ್ನು ರಚಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n"
 
-#: ../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:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"ದೋಷ: ನಾವು IPv6 ಮೂಲಕ ಸಂಪರ್ಕಿತಗೊಂಡಿರುವಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು ತಡೆ "
+"ಹಿಡಿಯಲಾಗುತ್ತಿದೆ.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "ಅಮಾನ್ಯವಾದ EPSV ಪ್ರತಿಕ್ರಿಯೆ '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ಸ್ಥಳೀಯ ಸಾಕೆಟ್‌ನ ವಿಳಾಸವನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕವನ್ನು ಅಂಗೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ಒಟ್ಟು"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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"
+msgstr ""
+"%s/tcp ಎಂಬ ಹೆಸರಿನ ಸೇವೆಯು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವೆಗಳ ಕಡತವನ್ನು ಪರಿಶೀಲಿಸಿ\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "ಸಾಕೆಟ್‌ ಫ್ಲಾಗ್‌ಗಳನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "ಸಾಕೆಟ್‌ ಅನ್ನು ನಿರ್ಬಂಧಿಸದೆ ಇರುವಂತೆ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH ಪ್ರೊಗಾಂ ಹೆಸರು:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH ಕಾರ್ಯಗತಗೊಳಿಸಬಲ್ಲದುದರ ಮಾರ್ಗ"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH ಹೆಚ್ಚುವರಿ ನಿಯತಾಂಕಗಳು:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH ಪ್ರೊಗ್ರಾಮಿಗೆ ವರ್ಗಾಯಿಸ ಬೇಕಿರುವ ಹೆಚ್ಚುವರಿ ನಿಯತಾಂಕಗಳು"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ಬಳಕೆದಾರ/ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH ಸಂಪರ್ಕಕ್ಕಾಗಿ ಒಂದು ಬಳಕೆದಾರ ಹೆಸರು/ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "ಪ್ರೊಗ್ರಾಮ್ %s ಅನ್ನು ಚಲಾಯಿಸಲಾಗುತ್ತಿದೆ\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA ಕೀಲಿಗಾಗಿ ಗುಪ್ತವಾಕ್ಯವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "ಕೀಲಿಗಾಗಿ ಗುಪ್ತವಾಕ್ಯವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "ಗುಪ್ತಪದ"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "ಗುಪ್ತಪದ"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ಹೌದು/ಇಲ್ಲ)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE ಅನ್ನು ನಮೂದಿಸಿ:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ದೋಷ: ಒಂದು ಸರಿಯಲ್ಲದ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: ಪ್ರೊಟೋಕಾಲ್ ಆರಂಭಗೊಳಿಕೆ\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: ಪ್ರೊಟೋಕಾಲ್ ಆವೃತ್ತಿ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s ಅನ್ನು ತೆರೆ\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: ಮುಚ್ಚು\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: ಕೋಶ %s ಅನ್ನು ತೆರೆ\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ಕೋಶವನ್ನು ಓದು\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ಕಡತ %s ಅನ್ನು ತೆಗೆದು ಹಾಕು\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: ಕೋಶ %s ಅನ್ನು ನಿರ್ಮಿಸು\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ಕೋಶ %s ಅನ್ನು ತೆಗೆದು ಹಾಕು\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ಕಡತದ ಗುಣವಿಶೇಷಗಳು\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ಸರಿ"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "ಅಂತಹ ಯಾವುದೆ ಕಡತ ಅಥವ ಕೋಶವಿಲ್ಲ"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "ಅನುಮತಿಯು ನಿರಾಕರಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ವಿಫಲತೆ"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ಸರಿಯಲ್ಲದ ಸಂದೇಶ"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "ಯಾವುದೆ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "ಕಾರ್ಯಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "ತಿಳಿಯದೆ ಇರುವ ಸಂದೇಶವು ಪರಿಚಾರಕದಿಂದ ಮರಳಿದೆ"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ದೋಷ: ಸಂದೇಶದ ಗಾತ್ರ %d ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
+msgstr ""
+"ದೂರಸ್ಥ ಪರಿಚಾರಕದೊಂದಿಗೆ ಒಂದು SSH ಸಂಪರ್ಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. "
+"ಪರಿಚಾರಕದಿಂದ ಬಂದ ದೋಷ ಸಂದೇಶವು ಈ ಕೆಳಗಿನಂತಿದೆ:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH ಸಂಪರ್ಕವನ್ನು %s ಗೆ ತೆರೆಯಲಾಗುತ್ತಿದೆ\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH ಪರಿಚಾರಕ %s ಕ್ಕೆ ಯಶಸ್ವಿಯಾಗಿ ಪ್ರವೇಶಿಸಲಾಗಿದೆ\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL ಎಂಜಿನ್"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL ಎಂಟ್ರೋಪಿ ಕಡತ:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL ಎಂಟ್ರೋಪಿ ಕಡತ"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "ಎಂಟ್ರೋಪಿ ಸೀಡ್‌ನ ಉದ್ದ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL ಎಂಜಿನ್ ಅನ್ನು ಸೀಡ್ ಮಾಡಲು ಬಳಸಲಾಗುವ ಗರಿಷ್ಟ ಸಂಖ್ಯೆಯ ಬೈಟ್‌ಗಳು"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL ಪೀರ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1376,56 +1450,58 @@ msgstr ""
 "ವಿಷಯ = %s\n"
 "ದೋಷ %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "ಪೀರ್ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
-msgstr "ದೋಷ: SSL ಪ್ರಮಾಣಪತ್ರದಲ್ಲಿರುವ (%s) ಅತಿಥೇಯವು ನಾವು ಸಂಪರ್ಕಿತಗೊಂಡಿರುವ ಅತಿಥೇಯಕ್ಕೆ (%s) ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. 
ಸಂಪರ್ಕವನ್ನು ತಡೆಹಿಡಿಯಲಾಗುತ್ತಿದೆ.\n"
+msgstr ""
+"ದೋಷ: SSL ಪ್ರಮಾಣಪತ್ರದಲ್ಲಿರುವ (%s) ಅತಿಥೇಯವು ನಾವು ಸಂಪರ್ಕಿತಗೊಂಡಿರುವ ಅತಿಥೇಯಕ್ಕೆ (%s) "
+"ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. ಸಂಪರ್ಕವನ್ನು ತಡೆಹಿಡಿಯಲಾಗುತ್ತಿದೆ.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL ಲೈಬ್ರರಿಯನ್ನು ಆರಂಭಿಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ SSL ಪ್ರಮಾಣಪತ್ರಗಳಿಲ್ಲ\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "ಸಿಫರ್ ಪಟ್ಟಿಯನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ (ಮಾನ್ಯವಾದ ಯಾವುದೆ ಸಿಫರುಗಳಿಲ್ಲ)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ದೋಷ: SSL ಸಾಧನವನ್ನು ಆರಂಭಿಸಲಾಗಿಲ್ಲ\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL ಸಂಪರ್ಕವನ್ನು ಸಿದ್ಧಗೊಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ (BIO ವಸ್ತು)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL ಸಂಪರ್ಕವನ್ನು ಸಿದ್ಧಗೊಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ (SSL ವಸ್ತು)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ಪೀರ್ ಪ್ರಮಾಣಪತ್ರದಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "ಕಾರ್ಯವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "ಇನ್ನೊಮ್ಮೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುವ ಮೊದಲು %d ಸೆಕೆಂಡುಗಳು ಕಾಯಲಾಗುತ್ತದೆ\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1435,73 +1511,73 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it under certain "
 "conditions; for details, see the COPYING file\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "ಅನುವಾದಿಸಿದವರು: ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkete redhat com>"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ಬಳಕೆ: chmod <ಕ್ರಮ> <ಕಡತ>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ಬಳಕೆ: rename <ಹಳೆತ ಹೆಸರು> <ಹೊಸ ಹೆಸರು>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ಬಳಕೆ: delete <ಕಡತ>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ಬಳಕೆ: rmdir <ಕೋಶ>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ಬಳಕೆ: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ಬಳಕೆ: mkdir <ಹೊಸ ಕಡತಕೋಶ>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ಬಳಕೆ: chdir <ಕೋಶ>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "ಅಮಾನ್ಯವಾದ ಆರ್ಗುಮೆಂಟ್‌\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ಕೋಶದ ಕ್ಯಾಶೆಯನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸು\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ಬಳಕೆ: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ಬಳಕೆ: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ದೋಷ: ವೇರಿಯೇಬಲ್ %s ಯು ಒಂದು ಮಾನ್ಯವಾದ ಸಂರಚನಾ ವೇರಿಯೇಬಲ್ ಆಗಿಲ್ಲ.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1509,321 +1585,325 @@ msgstr ""
 "ಬೆಂಬಲವಿರುವ ಆಜ್ಞೆಗಳು:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ಬಳಕೆ: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "ಪ್ರಸಕ್ತ ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು Asciiಗೆ ಹೊಂದಿಸುತ್ತದೆ (ಕೇವಲ FTP ಗಾಗಿ ಮಾತ್ರ)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ಬೈನರಿ"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "ಪ್ರಸಕ್ತ ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು ಬೈನರಿಗೆ ಹೊಂದಿಸುತ್ತದೆ (ಕೇವಲ FTP ಗಾಗಿ ಮಾತ್ರ)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "ದೂರಸ್ಥ ಕೆಲಸದ ಕೋಶವನ್ನು ಬದಲಾಯಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "ಒಂದು ದೂರಸ್ಥ ಕಡತದ ಅನುಮತಿಗಳನ್ನು ಬದಲಾಯಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳು: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "ದೂರಸ್ಥ ತಾಣದಿಂದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "ಒಂದು ದೂರಸ್ಥ ಕಡತವನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "ಪ್ರಸಕ್ತ ದೂರಸ್ಥ ಕೋಶಕ್ಕಾಗಿನ ಕೋಶ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "ದೂರಸ್ಥ ಕಡತವನ್ನು(ಗಳನ್ನು) ಡೌನ್‌ಲೋಡ್ ಮಾಡುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "ನೆರವು ಪರದೆಯನ್ನು ತೋರಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "ಸ್ಥಳೀಯ ಕೆಲಸದ ಕೋಶವನ್ನು ಬದಲಾಯಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "ಒಂದು ಸ್ಥಳೀಯ ಕೋಶದ ಅನುಮತಿಗಳನ್ನು ಬದಲಾಯಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ಒಂದು ಸ್ಥಳಿಯ ಕೋಶವನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "ಪ್ರಸಕ್ತ ಸ್ಥಳೀಯ ಕೋಶಕ್ಕಾಗಿನ ಕೋಶ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "ಒಂದು ಸ್ಥಳೀಯ ಕೋಶವನ್ನು ರಚಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "ಈಗಿನ ಸ್ಥಳೀಯ ಕೋಶವನ್ನು ತೋರಿಸು"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "ಒಂದು ಸ್ಥಳೀಯ ಕಡತದ ಹೆಸರನ್ನು ಬದಲಾಯಿಸು"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ಒಂದು ಸ್ಥಳೀಯ ಕೋಶವನ್ನು ತೆಗೆದುಹಾಕು"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "ಒಂದು ದೂರಸ್ಥ ಕೋಶವನ್ನು ರಚಿಸುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "ಸ್ಥಳೀಯ ಕಡತವನ್ನು(ಗಳನ್ನು) ಅಪ್‌ಲೋಡ್ ಮಾಡುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "ಒಂದು ದೂರಸ್ಥ ತಾಣಕ್ಕೆ ಸಂಪರ್ಕವನ್ನು ತೆರೆಯುತ್ತದೆ"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "ಈಗಿನ ದೂರಸ್ಥ ಕೋಶವನ್ನು ತೋರಿಸು"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP ಇಂದ ನಿರ್ಗಮಿಸು"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "ದೂರಸ್ಥ ಕೋಶದ ಹೆಸರನ್ನು ಬದಲಾಯಿಸು"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ದೂರಸ್ಥ ಕೋಶವನ್ನು ತೆಗೆದು ಹಾಕು"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "ಸಂರಚನಾ ಕಡತ ವೇರಿಯೇಬಲ್‌ಗಳನ್ನು ತೋರಿಸು. ನೀವು ಸೆಟ್‌ var=val ಅನ್ನು ಬಳಸಿಕೊಂಡೂ ಸಹ ವೇರಿಯೇಬಲ್‌ಗಳನ್ನು 
ಹೊಂದಿಸಬಹುದು"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"ಸಂರಚನಾ ಕಡತ ವೇರಿಯೇಬಲ್‌ಗಳನ್ನು ತೋರಿಸು. ನೀವು ಸೆಟ್‌ var=val ಅನ್ನು ಬಳಸಿಕೊಂಡೂ ಸಹ "
+"ವೇರಿಯೇಬಲ್‌ಗಳನ್ನು ಹೊಂದಿಸಬಹುದು"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "ಒಂದು ತಾಣಕ್ಕೆ ವಿಶಿಷ್ಟವಾದ ಆಜ್ಞೆಯನ್ನು ಚಲಾಯಿಸು"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ದೋಷ: ಆಜ್ಞೆಯನ್ನು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ಕಡತ %s ವನ್ನು (%s ಅತಿಥೇಯದಲ್ಲಿನ) ಉಪೇಕ್ಷಿಸಲಾಗುತ್ತಿದೆ\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "ಅತಿಥೇಯ %s ದಲ್ಲಿನ ವರ್ಗಾವಣೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s ಅನ್ನು %s ಇಂದ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
-msgstr "ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಾಗದೆ ಇರುವಂತಹ %d ಕಡತಗಳು ಅಥವ ಕೋಶಗಳಿವೆ. ಯಾವ ಅಂಶಗಳನ್ನು ಸರಿಯಾಗಿ ವರ್ಗಾಯಿಸಲಾಗಿಲ್ಲ ಎಂದು 
ಪರಿಶೀಲಿಸಲು ದಾಖಲೆಯನ್ನು ನೋಡಿ."
+msgstr ""
+"ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಾಗದೆ ಇರುವಂತಹ %d ಕಡತಗಳು ಅಥವ ಕೋಶಗಳಿವೆ. ಯಾವ ಅಂಶಗಳನ್ನು ಸರಿಯಾಗಿ "
+"ವರ್ಗಾಯಿಸಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಶೀಲಿಸಲು ದಾಖಲೆಯನ್ನು ನೋಡಿ."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: ಬೇರೆ ಏನಾದರೂ ಮಾಡುವ ಮೊದಲು ದಯವಿಟ್ಟು ನಿಲ್ಲಿಸು ಗುಂಡಿಯನ್ನು ಒತ್ತಿ\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಚಲಾಯಿಸು"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸೇರಿಸು:  ಬುಕ್‌ಮಾರ್ಕಿಗಾಗಿ ನೀವು ಒಂದು ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸೇರಿಸು: ಬುಕ್‌ಮಾರ್ಕ್ %s ಅನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಈ ಹೆಸರು ಈಗಾಗಲೆ "
 "ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸೇರಿಸು"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸೇರಿಸು: ನೀವು ಒಂದು ಅತಿಥೇಯದ ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1833,31 +1913,31 @@ msgstr ""
 "ನೀವು / ಅನ್ನು ಬಳಸಿಕೊಂಡು ಅಂಶಗಳನ್ನು ಒಂದು ಉಪಮೆನುವನ್ನು ಇರಿಸಬಹುದು\n"
 "(ಉದಾ: ಲಿನಕ್ಸ್ ತಾಣಗಳು/ಡಿಬಿಯನ್)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ನೆನಪಿಟ್ಟುಕೊ"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "ಬುಕ್‌ಮಾರ್ಕಿಗಾಗಿ ನೀವು ಒಂದು ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "ಹೊಸ ಕಡತಕೋಶ"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "ನಿರ್ಮಿಸಬೇಕಿರುವ ಹೊಸ ಕಡತಕೋಶದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "ಹೊಸ ಅಂಶ"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "ನಿರ್ಮಿಸಬೇಕಿರುವ ಹೊಸ ಅಂಶದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1866,106 +1946,99 @@ msgstr ""
 "ಬುಕ್‌ಮಾರ್ಕ್ %s ಅನ್ನು ಹಾಗು ಅದರ ಇತರೆ ಎಲ್ಲಾ ಸಂತತಿಗಳನ್ನು\n"
 "ಅಳಿಸಿ ಹಾಕಲು ನೀವು ಖಚಿತವೆ?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳು"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "ನಮೂದನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "ವಿವರಣೆ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ಅತಿಥೇಯ ಹೆಸರು:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "ಸಂಪರ್ಕ ಸ್ಥಾನ:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "ಪ್ರೊಟೋಕಾಲ್:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "ದೂರಸ್ಥ ಕೋಶ:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ಸ್ಥಳೀಯ ಕೋಶ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ಬಳಕೆದಾರಹೆಸರು:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "ಗುಪ್ತಪದ:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "ಖಾತೆ:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "\"ಅನಾಮಧೇಯ\"ರಾಗಿ  ಪ್ರವೇಶಿಸಿ"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  ರದ್ದುಗೊಳಿಸು  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ಕಡತ(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ಕಡತ/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ಕಡತ/ಹೊಸ ಕಡತಕೋಶ(_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ಕಡತ/ಹೊಸ ಅಂಶ(_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ಕಡತ/ಅಳಿಸು(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ಕಡತ/ಗುಣಧರ್ಮಗಳು(_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ಕಡತ/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ಕಡತ/ಮುಚ್ಚು(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1973,91 +2046,90 @@ msgstr ""
 "ಈಗ ನೀವು ನಿಮ್ಮ ಕಡತದ(ಗಳ) ಗುಣವಿಶೇಷಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು\n"
 "ಸೂಚನೆ: ಎಲ್ಲಾ ftp ಪರಿಚಾರಕಗಳು chmod ಸೌಕರ್ಯವನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "ವಿಶೇಷ"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ಸ್ಟಿಕಿ"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ಬಳಕೆದಾರ"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "ಓದು"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "ಬರೆ"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ಕಾರ್ಯಗತಗೊಳಿಸು"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "ಸಮೂಹ"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "ನೀವು ಈ %ld ಕಡತಗಳನ್ನು %ld ಕೋಶಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವೆ"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "ನೀವು ಈ %ld ಕಡತಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವೆ"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "ನೀವು ಈ %ld ಕೋಶಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವೆ"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ಕಡತಗಳನ್ನು/ಕೋಶಗಳನ್ನು ಅಳಿಸು"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "ಅಳಿಸು"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸು"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s ಅನ್ನು ಪಡೆಯಲಾಗಿದೆ\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ಎಳೆದು-ಸೇರಿಸು"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ನಿರ್ಗಮಿಸು"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2065,468 +2137,455 @@ msgstr ""
 "ಕಡತವರ್ಗಾವಣೆ ಕಾರ್ಯವು ನಡೆಯುತ್ತಿದೆ.\n"
 "ನೀವು ಖಚಿತವಾಗಿಯೂ ನಿರ್ಗಮಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "ಸ್ಥಳವನ್ನು ತೆರೆ"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "ಸಂಪರ್ಕಿಸಲು ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/ವಿಂಡೊ _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/ವಿಂಡೊ _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/ಬೈನರಿ(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/ಆದ್ಯತೆಗಳು(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/ನಿರ್ಗಮಿಸು(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ಸ್ಥಳೀಯ(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/ಸ್ಥಳೀಯ/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/ಸ್ಥಳೀಯ/ಸ್ಥಳವನ್ನು ತೆರೆ(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/ಸ್ಥಳೀಯ/ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕು(_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/ಸ್ಥಳೀಯ/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/ಸ್ಥಳೀಯ/_Filespec ಅನ್ನು ಬದಲಾಯಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/ಸ್ಥಳೀಯ/ಆಯ್ಕೆ ಮಾಡಿದ್ದನ್ನು ತೋರಿಸು(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/ಸ್ಥಳೀಯ/ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡು(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/ಸ್ಥಳೀಯ/ಎಲ್ಲಾ ಕಡತಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡು"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/ಸ್ಥಳೀಯ/ಎಲ್ಲಾ ಆಯ್ಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸು"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/ಸ್ಥಳೀಯ/ಕೋಶ ಪಟ್ಟಿಯನ್ನು ಉಳಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/ಸ್ಥಳೀಯ/SITE ಆಜ್ಞೆಯನ್ನು ಕಳುಹಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/ಸ್ಥಳೀಯ/ಕೋಶವನ್ನು ಬದಲಾಯಿಸು(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/ಸ್ಥಳೀಯ/ಅನುಮತಿಗಳು(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ಸ್ಥಳೀಯ/ಹೊಸ ಕಡತಕೋಶ(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/ಸ್ಥಳೀಯ/ಹೆಸರು ಬದಲಿಸು(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/ಸ್ಥಳೀಯ/ಅಳಿಸು(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/ಸ್ಥಳೀಯ/ಸಂಪಾದಿಸು(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/ಸ್ಥಳೀಯ/ನೋಟ(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/ಸ್ಥಳೀಯ/ಪುನಶ್ಚೇತನಗೊಳಿಸು(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/ದೂರಸ್ಥ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/ದೂರಸ್ಥ/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/ದೂರಸ್ಥ/ಸ್ಥಳವನ್ನು ತೆರೆ(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/ದೂರಸ್ಥ/ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು(_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/ದೂರಸ್ಥ/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/ದೂರಸ್ಥ/ಕಡತದ _Filespec ಅನ್ನು ಬದಲಾಯಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/ದೂರಸ್ಥ/ಆಯ್ಕೆ ಮಾಡಿದ್ದನ್ನು ತೋರಿಸು(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/ದೂರಸ್ಥ/ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡು(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/ದೂರಸ್ಥ/ಎಲ್ಲಾ ಕಡತಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡು"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/ದೂರಸ್ಥ/ಎಲ್ಲಾ ಆಯ್ಕೆಯನ್ನು ರದ್ದು ಮಾಡು"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/ದೂರಸ್ಥ/ಕೋಶದ ಪಟ್ಟಿಯನ್ನು ಉಳಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/ದೂರಸ್ಥ/SITE ಆಜ್ಞೆಯನ್ನು ಕಳುಹಿಸು..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/ದೂರಸ್ಥ/ಕೋಶವನ್ನು ಬದಲಿಸು(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/ದೂರಸ್ಥ/ಅನುಮತಿಗಳು(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/ದೂರಸ್ಥ/ಹೊಸ ಕಡತಕೋಶ(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/ದೂರಸ್ಥ/ಹೆಸರನ್ನು ಬದಲಿಸು(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/ದೂರಸ್ಥ/ಅಳಿಸು(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/ದೂರಸ್ಥ/ಸಂಪಾದಿಸು(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/ದೂರಸ್ಥ/ನೋಟ(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/ದೂರಸ್ಥ/ಪುನಶ್ಚೇತನಗೊಳಿಸು(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/ಬುಕ್‌ಮಾರ್ಕುಗಳು(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/ಬುಕ್‌ಮಾರ್ಕುಗಳು/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/ಬುಕ್‌ಮಾರ್ಕುಗಳು/ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸೇರಿಸು(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/ಬುಕ್‌ಮಾರ್ಕುಗಳು/ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/ಬುಕ್‌ಮಾರ್ಕುಗಳು/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/ವರ್ಗಾವಣೆ(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/ವರ್ಗಾವಣೆ/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/ವರ್ಗಾವಣೆ/ಆರಂಭಿಸು(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/ವರ್ಗಾವಣೆ/ನಿಲ್ಲಿಸು(_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/ವರ್ಗಾವಣೆ/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/ವರ್ಗಾವಣೆ/ಪ್ರಸಕ್ತ ಕಡತವನ್ನು ಉಪೇಕ್ಷಿಸು(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/ವರ್ಗಾವಣೆ/ಕಡತವನ್ನು ಮೇಲಕ್ಕೆ ಜರುಗಿಸು(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/ವರ್ಗಾವಣೆ/ಕಡತವನ್ನು ಮೇಲಕ್ಕೆ ಜರುಗಿಸು(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/ವರ್ಗಾವಣೆ/ಕಡತವನ್ನು ಕೆಳಕ್ಕೆ ಜರುಗಿಸು(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/ವರ್ಗಾವಣೆ/ಕಡತಗಳನ್ನು ಹಿಂಪಡೆ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/ವರ್ಗಾವಣೆ/ಕಡತಗಳನ್ನು ಇರಿಸು(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/ದಾಖಲೆ(_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/ದಾಖಲೆ/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/ದಾಖಲೆ/ಅಳಿಸು(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/ದಾಖಲೆ/ನೋಟ(_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/ದಾಖಲೆ/ಉಳಿಸು(_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ಉಪಕರಣಗಳು(_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ಉಪಕರಣಗಳು/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/ಉಪಕರಣಗಳು/ವಿಂಡೋಸ್ ಅನ್ನು ಹೋಲಿಸು(_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/ಉಪಕರಣಗಳು/ಕ್ಯಾಶೆಯನ್ನು ಅಳಿಸು(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/ನೆರವು"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/ನೆರವು/ಹರಿದುಹಾಕು"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/ನೆರವು/ಇದರ ಬಗ್ಗೆ(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "ಅತಿಥೇಯ: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "ಅತಿಥೇಯ(_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "ಸಂಪರ್ಕಸ್ಥಾನ: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ಬಳಕೆದಾರ: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ಬಳಕೆದಾರ(_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "ಪಾಸ್‌: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "ಆಜ್ಞೆ: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ಕಡತದ ಹೆಸರು"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "ಗಾತ್ರ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "ದಿನಾಂಕ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "ಗುಣವಿಶೇಷಗಳು"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ಪ್ರಗತಿ"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ದೋಷ: ಸಂಪರ್ಕ ಕಲ್ಪಿಸಬೇಕಿರುವ ಒಂದು ಅತಿಥೇಯದಲ್ಲಿ ನಮೂದಿಸಬೇಕು\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ಪುನಶ್ಚೇತನಗೊಳಿಸು"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "ದಯವಿಟ್ಟು ಈ ತಾಣಕ್ಕಾಗಿನ ನಿಮ್ಮ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "ದಯವಿಟ್ಟು ಈ ತಾಣಕ್ಕಾಗಿನ ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "ಕಾರ್ಯವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ...ನೀವು ಒಂದು ವಾಕ್ಯವನ್ನು ನಮೂದಿಸಬೇಕು\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "ಕೋಶವನ್ನು ನಿರ್ಮಿಸಿ"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "ನಿರ್ಮಿಸಬೇಕಿರುವ ಕೋಶದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "ಹೆಸರು ಬದಲಾಯಿಸು"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s ನ ಹೆಸರನ್ನು ಯಾವುದಕ್ಕೆ ಬದಲಾಯಿಸಲು ಬಯಸುತ್ತೀರಿ?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "ತಾಣ"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ತಾಣ-ನಿಶ್ಚಿತವಾದ ಆಜ್ಞೆಯನ್ನು ನಮೂದಿಸಿ"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE ಅನ್ನು ಹಿಂದೆ ಸೇರಿಸಿ"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "ತಿದ್ದಿಬರೆ"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "ಮರಳಿ ಆರಂಭಿಸು"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "ಉಪೇಕ್ಷಿಸು"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "ಕಾರ್ಯ"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ಕಡತಗಳನ್ನು ವರ್ಗಾಯಿಸು"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2534,70 +2593,74 @@ msgstr ""
 "ಈ ಕೆಳಗಿನ ಕಡತವು(ಗಳು) ಸ್ಥಳೀಯ ಹಾಗು ದೂರಸ್ಥ ಗಣಕದಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ\n"
 "ನೀವು ಏನು ಮಾಡಬಯಸುತ್ತೀರಿ ಎಂದು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ದೋಷ"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ಕಡತವನ್ನು ಉಪೇಕ್ಷಿಸು"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "ಎಲ್ಲವನ್ನೂ ಆರಿಸು"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "ಎಲ್ಲಾ ಆಯ್ಕೆಯನ್ನು ರದ್ದು ಮಾಡು"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Filespec ನ ಬದಲಾವಣೆ: ಕಾರ್ಯವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ...ನೀವು ಒಂದು ವಾಕ್ಯವನ್ನು ನಮೂದಿಸಬೇಕು\n"
+msgstr ""
+"Filespec ನ ಬದಲಾವಣೆ: ಕಾರ್ಯವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ...ನೀವು ಒಂದು ವಾಕ್ಯವನ್ನು "
+"ನಮೂದಿಸಬೇಕು\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec ಅನ್ನು ಬದಲಾಯಿಸಿ"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ದೋಷ: %s ಅನ್ನು ಓದಲು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ಕೋಶದ ಪಟ್ಟಿಯನ್ನು ಉಳಿಸು"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ದೋಚ: %s ಗೆ ಬರೆಯುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "ದಾಖಲೆ ಕಡತವನ್ನು ಯಶಸ್ವಿಯಾಗಿ %s ಗೆ ಬರೆಯಲಾಗಿದೆ\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "ದಾಖಲೆಯನ್ನು ಉಳಿಸು"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "COPYING ಎಂಬ ಹೆಸರಿನ ಪರವಾನಗಿ ಒಪ್ಪಂದದ ಪ್ರತಿಯು ಕಂಡುಬಂದಿಲ್ಲ. ಇದು %s ನಲ್ಲಿ ಅಥವ %s ನಲ್ಲಿ ಇದೆ ಎಂದು 
ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"
+msgstr ""
+"COPYING ಎಂಬ ಹೆಸರಿನ ಪರವಾನಗಿ ಒಪ್ಪಂದದ ಪ್ರತಿಯು ಕಂಡುಬಂದಿಲ್ಲ. ಇದು %s ನಲ್ಲಿ ಅಥವ %s ನಲ್ಲಿ "
+"ಇದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP ಬಗ್ಗೆ"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2608,27 +2671,23 @@ msgstr ""
 "ಹಕ್ಕು (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "ಅಧೀಕೃತವಾದ ನೆಲೆಪುಟ(ಹೋಮ್‌ಪೇಜ್): http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ಲೈಸೆನ್ಸ್‍ ಒಡಂಬಡಿಕೆ"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  ಮುಚ್ಚು  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "ವಿಂಡೋಸ್ ಅನ್ನು ಹೋಲಿಸು"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "ದೂರಸ್ಥ ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕು"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2636,72 +2695,56 @@ msgstr ""
 "ಅತಿಥೇಯದ ನಮೂದಿನಲ್ಲಿ ಸೂಚಿಸಲಾದ ತಾಣಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸು. ಅತಿಥೇಯ ನಮೂದು ಖಾಲಿ ಇದ್ದಲ್ಲಿ, "
 "URL ಅನ್ನು ನಮೂದಿಸಲು ನಿಮಗೆ ಒಂದು ಸಂವಾದವನ್ನು ಒದಗಿಸಲಾಗುವುದು."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (ಹಿಡಿದಿಡಲಾದ) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿಲ್ಲ"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ಕಡತ %s ಅನ್ನು ತೆರೆಯುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ದೂರಸ್ಥ ತಾಣಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ಈ ಪ್ರೊಟೋಕಾಲ್‌ನಲ್ಲಿ ಈ ಸವಲತ್ತು ಲಭ್ಯವಿಲ್ಲ\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: ನೀವು ಕೇವಲ ಒಂದು ಅಂಶವನ್ನು ಆರಿಸಬೇಕು\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: ನೀವು ಕನಿಷ್ಟ ಒಂದು ಅಂಶವನ್ನಾದರೂ ಆರಿಸಬೇಕು\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "ಬದಲಾಯಿಸು"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "ಸೇರಿಸು"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ರದ್ದು ಮಾಡು"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  ಹೌದು  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  ಇಲ್ಲ  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ಕೋಶದ ಪಟ್ಟಿಯನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  ನಿಲ್ಲಿಸು  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2710,109 +2753,89 @@ msgstr ""
 "%ld ಕೋಶಗಳನ್ನು\n"
 "ಹಾಗು %ld ಕಡತಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP ದೋಷ: ಕಡತ %s ವು %s ಅಥವ %s ಯಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ಅತಿಥೇಯವನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "ಅತಿಥೇಯವನ್ನು ಸೇರಿಸು"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "ಪ್ರಕಾರ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "ಬಗೆ(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ಡೊಮೈನ್"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "ಜಾಲಬಂಧ ವಿಳಾಸ"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "ಜಾಲಬಂಧ ವಿಳಾಸ(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "ಜಾಲಮುಸುಕು(ನೆಟ್‍ಮಾಸ್ಕ್‍)"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "ಜಾಲಮುಸುಕು(ನೆಟ್‍ಮಾಸ್ಕ್‍)(_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ಕ್ಷೇತ್ರ(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "ಜಾಲಮುಸುಕು(ನೆಟ್‍ಮಾಸ್ಕ್‍)"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "ಸ್ಥಳೀಯ ಅತಿಥೇಯಗಳು"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "ಸಂಪಾದಿಸು"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "ಸಂಪಾದನೆ(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ಆಯ್ಕೆಗಳು"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "ಅನ್ವಯಿಸು"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ಕಡತ ಹೆಸರುಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಲಾಗಿದೆ..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "ಸಂಪರ್ಕ ಹೊಂದಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ಕಡತಗಳನ್ನು ಮರಳಿ ಪಡೆ: ದೂರಸ್ಥ ತಾಣಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿಲ್ಲ\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ದೋಷ: ಚೈಲ್ಡ್ %d %d ಅನ್ನು ಮರಳಿಸಿದೆ\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "ಚೈಲ್ಡ್ %d ಯಶಸ್ವಿಯಾಗಿ ಮರಳಿದೆ\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "ದೋಷ: ಚೈಲ್ಡ್ %d ಸರಿಯಾಗಿ ಅಂತ್ಯಗೊಂಡಿಲ್ಲ\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ದೋಷ: ಕಡತ %s ದ ಬಗೆಗಿನ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ಕಡತ %s ಅನ್ನು ಬದಲಾಯಿಸಲಾಗಿಲ್ಲ\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2821,115 +2844,162 @@ msgstr ""
 "ಕಡತ %s ಅನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.\n"
 "ನೀವದನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ಕಡತವನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ಮುಗಿಸಲಾಗಿದೆ"
 
-#: ../src/gtk/transfer.c:734
+#: 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 ಸಮಯ ಉಳಿದಿದೆ ಎಂದು 
ಅಂದಾಜು ಮಾಡಲಾಗಿದೆ"
+msgstr ""
+"%s ಅನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ (ಒಟ್ಟು %s ನಲ್ಲಿ ಹಾಗು %.2fKB/s ದರದಲ್ಲಿ), ಒಟ್ಟು %02d:%02d:"
+"%02d ಸಮಯ ಉಳಿದಿದೆ ಎಂದು ಅಂದಾಜು ಮಾಡಲಾಗಿದೆ"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "%s ಅನ್ನು ಪಡೆಯಲಾಗಿದೆ (ಒಟ್ಟು %s ನಲ್ಲಿ ಹಾಗು %.2fKB/s ದರದಲ್ಲಿ), ಒಟ್ಟು %02d:%02d:%02d ಸಮಯ ಉಳಿದಿದೆ ಎಂದು 
ಅಂದಾಜು ಮಾಡಲಾಗಿದೆ"
+msgstr ""
+"%s ಅನ್ನು ಪಡೆಯಲಾಗಿದೆ (ಒಟ್ಟು %s ನಲ್ಲಿ ಹಾಗು %.2fKB/s ದರದಲ್ಲಿ), ಒಟ್ಟು %02d:%02d:%02d "
+"ಸಮಯ ಉಳಿದಿದೆ ಎಂದು ಅಂದಾಜು ಮಾಡಲಾಗಿದೆ"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
-msgstr "%s ಅನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ (%s ನಲ್ಲಿ), ವರ್ಗಾವಣೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ, ಬಾಕಿ ಉಳಿದಿರುವ ಸಮಯ ತಿಳಿದಿಲ್ಲ"
+msgstr ""
+"%s ಅನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ (%s ನಲ್ಲಿ), ವರ್ಗಾವಣೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ, ಬಾಕಿ ಉಳಿದಿರುವ ಸಮಯ "
+"ತಿಳಿದಿಲ್ಲ"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
-msgstr "%s ಅನ್ನು ಪಡೆಯಲಾಗಿದೆ (%s ನಲ್ಲಿ), ವರ್ಗಾವಣೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ, ಬಾಕಿ ಉಳಿದಿರುವ ಸಮಯ ತಿಳಿದಿಲ್ಲ"
+msgstr ""
+"%s ಅನ್ನು ಪಡೆಯಲಾಗಿದೆ (%s ನಲ್ಲಿ), ವರ್ಗಾವಣೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ, ಬಾಕಿ ಉಳಿದಿರುವ ಸಮಯ "
+"ತಿಳಿದಿಲ್ಲ"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "ಪೂರ್ಣಗೊಂಡ ಪ್ರತಿಶತ ತಿಳಿಯುತ್ತಿಲ್ಲ. (ಕಡತ %ld, %ld ರಲ್ಲಿ)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 ಸಮಯ ಬಾಕಿ ಇದೆ. (ಕಡತ %ld, %ld ರಲ್ಲಿ)"
+msgstr ""
+"%d%% ಪೂರ್ಣಗೊಂಡಿದೆ, ಅಂದಾಜು %02d:%02d:%02d ಸಮಯ ಬಾಕಿ ಇದೆ. (ಕಡತ %ld, %ld ರಲ್ಲಿ)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ಕಡತದ ಹೆಸರುಗಳನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ...%s ಬೈಟ್‌ಗಳು"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "ನೋಟ"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "ಸಂಪಾದಿಸು"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "ನೋಟ: ಬೇರೊಂದು ಪ್ರಕ್ರಿಯೆಯನ್ನು ಫೋರ್ಕ್ ಮಾಡಲಾಗಿಲ್ಲ: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "ಈ ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ಚಲಾಯಿಸಲಾಗುತ್ತಿದೆ: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ಅನ್ನು %s ನೊಂದಿಗೆ ತೆರೆಯಲಾಗುತ್ತಿದೆ\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s ಕಡತವನ್ನು ನೋಡಲಾಗುತ್ತಿದೆ\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "ನೋಟ: %s ಕಡತವನ್ನು ನೋಡಲು ಸಾಧ್ಯವಿಲ್ಲ: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "ನಿಯಂತ್ರಿಸುವ ಟರ್ಮಿನಲ್ %s ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರು [ಅನಾಮಧೇಯ]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. (%s ಮೂಲ ಗಾತ್ರ, %s ನಿರ್ದೇಶಿತ ಗಾತ್ರ):\n"
-"ತಿದ್ದಿಬರೆ(o), ಮರಳಿ ಆರಂಭಿಸು(r), ಉಪೇಕ್ಷಿಸು(s), ಎಲ್ಲವನ್ನೂ ತಿದ್ದಿಬರೆ(O), ಎಲ್ಲವನ್ನೂ ಮರಳಿ ಆರಂಭಿಸು(R), ಎಲ್ಲವನ್ನೂ 
ಉಪೇಕ್ಷಿಸು(S): (%"
-"c)"
+"ತಿದ್ದಿಬರೆ(o), ಮರಳಿ ಆರಂಭಿಸು(r), ಉಪೇಕ್ಷಿಸು(s), ಎಲ್ಲವನ್ನೂ ತಿದ್ದಿಬರೆ(O), ಎಲ್ಲವನ್ನೂ ಮರಳಿ "
+"ಆರಂಭಿಸು(R), ಎಲ್ಲವನ್ನೂ ಉಪೇಕ್ಷಿಸು(S): (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  ರದ್ದುಗೊಳಿಸು  "
+
+#~ msgid "Host: "
+#~ msgstr "ಅತಿಥೇಯ: "
+
+#~ msgid "User: "
+#~ msgstr "ಬಳಕೆದಾರ: "
+
+#~ msgid "  Close  "
+#~ msgstr "  ಮುಚ್ಚು  "
+
+#~ msgid "Add"
+#~ msgstr "ಸೇರಿಸು"
+
+#~ msgid "Cancel"
+#~ msgstr "ರದ್ದು ಮಾಡು"
+
+#~ msgid "  Yes  "
+#~ msgstr "  ಹೌದು  "
+
+#~ msgid "  No  "
+#~ msgstr "  ಇಲ್ಲ  "
+
+#~ msgid "Type:"
+#~ msgstr "ಪ್ರಕಾರ:"
+
+#~ msgid "Network Address"
+#~ msgstr "ಜಾಲಬಂಧ ವಿಳಾಸ"
+
+#~ msgid "_Edit"
+#~ msgstr "ಸಂಪಾದನೆ(_E)"
 
+#~ msgid "Apply"
+#~ msgstr "ಅನ್ವಯಿಸು"
diff --git a/po/ko.po b/po/ko.po
index 4b13ff2..43f4fcc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,90 +6,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 2.0.18\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-11-26 16:29+0900\n"
 "Last-Translator: Namhyung Kim <namhyung gmail com>\n"
 "Language-Team: GNOME Korean <Gnome-kr-hackers lists kldp net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "%s은(는) 잘못된 URL입니다\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr "'%s' 문자열을 %s 문자셋에서 %s 문자셋으로 변환 중 에러: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:488
 #, 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:441
 #, 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP 경고: 책갈피 파일의 %d 라인 무시: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 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 "
@@ -99,7 +105,7 @@ msgstr ""
 "록시 서버를 사용하지 않을 것을 의미합니다. 형식: dont_use_proxy=.domain 혹는 "
 "dont_use_proxy=네트워크 번호/네트마스크"
 
-#: ../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"
@@ -107,167 +113,168 @@ msgstr ""
 "ext=파일 확장자:XPM 파일:Ascii 혹은 Binary (A 혹은 B):보기 프로그램. 참고: 파"
 "일 확장자를 제외한 나머지 인자들은 없어도 됩니다"
 
-#: ../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 책갈피 파일. Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>. "
-"경고: 당신이 이 파일에 더하는 어떤 코멘트도 *덮어써질* 것입니다"
+"gFTP 책갈피 파일. Copyright (C) 1998-2003 Brian Masney <masneyb gftp 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "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 설정 파일. Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>. "
-"경고: 당신이 이 파일에 더하는 어떤 코멘트도 *덮어써질* 것입니다. "
-"코멘트에 (*)을(를) 포함하고 있는 항목은 gFTP안에서 바꿀 수 없습니다"
+"gFTP 설정 파일. Copyright (C) 1998-2003 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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "에러: 파일 %s을(를) 업로드할 수 없습니다\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "에러: 파일 %s을(를) 쓸 수 없습니다: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "에러: 파일을 닫을 수 없습니다: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 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 "모름"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP 디렉토리 목록 %s을(를) 얻을 수 없습니다: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "디렉토리를 %s(으)로 성공적으로 바꾸었습니다\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 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:304
 #, 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:308
 #, 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"
@@ -275,7 +282,7 @@ msgstr ""
 "SSL 지원기능이 포함되지 않았기 때문에 FTPS는 사용할 수 없습니다. 연결을 취소"
 "합니다.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -283,112 +290,105 @@ msgstr ""
 "SSL 지원기능이 포함되지 않았기 때문에 HTTPS는 사용할 수 없습니다. 연결을 취소"
 "합니다.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "현재 작업 디렉토리를 알 수 없습니다: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "성공적으로 로컬 디렉토리를 %s(으)로 바꾸었습니다\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 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 "에러: %s의 모드를 %o(으)로 바꿀 수 없습니다: %s\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 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 "에러: %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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "없음"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "파일"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "크기"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "사용자"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "그룹"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "날짜"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "속성"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "내림순"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "올림순"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "일반"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "보기 프로그램:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -396,27 +396,27 @@ msgstr ""
 "파일을 볼 때 사용할 기본 프로그램. 여기가 비어있으면 내장된 기능을 사용하여 "
 "보여줍니다"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "편집기:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "파일을 편집할 기본 프로그램."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "최대 로그 창 크기:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ 버전에서 로그 창의 바이트 단위의 최대 크기"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "원격 문자셋::"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -424,11 +424,11 @@ msgstr ""
 "원격 메시지를 지역 로케일에 맞게 변환하기 위한 콤마로 구분되는 문자셋 목록입"
 "니다"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "원격 LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -436,183 +436,188 @@ msgstr ""
 "이것은 원격 사이트의 LC_TIME 값입니다. 디렉토리 목록에서 날짜를 제대로 표시하"
 "기 위한 것입니다."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "캐쉬 TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "얼마 후에 캐쉬를 지울 것인 지를 설정 (초단위의 시간)."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "파일 전송 추가"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "전송할 새 파일을 추가"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "한번에 하나씩 전송"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "한번에 하나만 전송할까요?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "기본적으로 덮어쓰기"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "기본적으로 파일을 덮어쓰거나 재전송하도록 설정"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "파일의 속성을 보존"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "전송된 파일의 속성을 보존"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "파일의 시간을 보존"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "전송된 파일의 시간을 보존"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "매 파일 전송후 갱신"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "각각의 파일이 전송된 후에 목록상자를 갱신"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "디렉토리를 처음에 위치"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "디렉토리들을 파일보다 앞에 위치"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "숨김 파일 보여주기"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "목록상자에서 숨김 파일 보여주기"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "타이틀에 전송 상태 표시"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "타이틀바에 파일 전송 상태 표시"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "파일 전송 시작"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "파일이 큐에 들어가면 자동으로 전송 시작"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI에서 수동 명령 허용"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI에서 수동 명령 입력을 허용 (텍스트 버전과 같은 기능)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "이전 디렉토리 기억"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr "프로그램이 종료될 때 마지막으로 열린 로컬 및 원격 디렉토리의 경로를 저장합니다"
+msgstr ""
+"프로그램이 종료될 때 마지막으로 열린 로컬 및 원격 디렉토리의 경로를 저장합니"
+"다"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "시작 시 원격 서버 연결"
 
-#: ../lib/options.h:117
+#: 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
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "네트워크"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "네트워크 시간제한:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "네트워크의 입출력 시간이 초과되었습니다. 이것은 idle 시간제한이 아닙니다."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "연결 재시도:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "자동으로 재시도할 횟수. 무한히 시도하려면 이 값을 0으로 설정하십시요"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "재시도 수면 시간:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "재시도 사이에 기다릴 초단위의 시간"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "최대 KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "파일 전송시 얻을 수 있는 최대 KB/s (사용않하려면 0으로 설정)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "전송 블록 크기:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "파일 전송에 사용할 블록 크기. 1024의 배수이어야 합니다."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "기본 프로토콜:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "사용할 기본 프로토콜 명시"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 기능 사용"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -620,50 +625,50 @@ msgstr ""
 "파일 목록 상자에서 파일을 더블클릭시에 어떤 동작을 수행할 것인지를 정의합니"
 "다. 0=파일 보기 1=파일 편집 2=파일 전송"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "로컬 파일 목록상자의 기본 넓이"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "원격 파일 목록상자의 기본 넓이"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "로컬/원격 파일 목록상자의 기본 높이"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "전송 목록상자의 기본 높이"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "로깅 창의 기본 높이"
 
-#: ../lib/options.h:177
+#: 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으로 설정하면 자동으로 열의 넓이가 바뀝니다."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "The default column to sort by"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sort ascending or descending"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -671,7 +676,7 @@ msgstr ""
 "파일 목록상자의 크기 열의 넓이. 0으로 설정하시면 자동으로 열의 넓이가 바뀝니"
 "다. -1로 설정하시면 이 열은 않보이게 됩니다"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -679,7 +684,7 @@ msgstr ""
 "파일 목록상자의 사용자 열의 넓이. 0으로 설정하시면 자동으로 열의 넓이가 바뀝"
 "니다. -1로 설정하시면 이 열은 않보이게 됩니다"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -687,7 +692,7 @@ msgstr ""
 "파일 목록상자의 그룹 열의 넓이. 0으로 설정하시면 자동으로 열의 넓이가 바뀝니"
 "다. -1로 설정하시면 이 열은 않보이게 됩니다"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -695,7 +700,7 @@ msgstr ""
 "파일 목록상자의 날짜 열의 넓이. 0으로 설정하시면 자동으로 열의 넓이가 바뀝니"
 "다. -1로 설정하시면 이 열은 않보이게 됩니다"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -703,246 +708,183 @@ msgstr ""
 "파일 목록상자의 속성 열의 넓이. 0으로 설정하시면 자동으로 열의 넓이가 바뀝니"
 "다. -1로 설정하시면 이 열은 않보이게 됩니다"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "서버로 보내질 명령의 색"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "서버에서 받을 명령의 색"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "에러 메시지의 색"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "나머지 로그 메시지의 색"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "로컬"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "책갈피"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, 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:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME을 '%s'(으)로 설정할 수 없습니다. '%s'을(를) 사용합니다\n"
 
-#: ../lib/protocols.c:389
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "%s 디렉토리 목록을 캐쉬에서 읽는 중 (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "%s 디렉토리 목록을 서버에서 읽는 중 (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:461
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "'%s' 문자열을 %s 문자셋에서 %s 문자셋으로 변환 중 에러: %s\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "에러: 캐쉬에 쓸 수 없습니다: %s\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "에러: %s 책갈피를 찾을 수 없습니다\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, 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:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\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:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "재귀적 심볼릭 링크 %s을(를) 찾았습니다\n"
 
-#: ../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 "에러: Cannot set close on exec flag: %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 "소켓을 non-blocking으로 설정할 수 없습니다: %s\n"
-
-#: ../lib/protocols.c:3064
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "에러: 원격 사이트 %s에서 끊겼습니다. 최대 재시도에 도달...포기\n"
 
-#: ../lib/protocols.c:3072
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "에러: 원격 사이트 %s에서 끊겼습니다. %d초 후에 재연결할 겁니다\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "에러: Cannot set close on exec flag: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "마스터 pty %s을(를) 열 수 없습니다: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "소켓 쌍을 만들 수 없습니다: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "에러: ssh를 실행할 수 없습니다: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "보기: 다른 프로세스를 생성(fork)할 수 없습니다: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "프록시 호스트명:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "방화벽 호스트명"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "프록시 포트:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "방화벽에 연결할 포트"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "프록시 사용자명:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "방화벽 사용자명"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "프록시 암호:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "방화벽 암호"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 사용"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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"
@@ -951,85 +893,84 @@ msgstr ""
 "서버로 부터 생각지 못한 응답을 받았습니다, 끊습니다\n"
 "잘못된 chunk 크기 '%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"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE 명령"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP 프록시"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Custom"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "전자우편 주소:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
-"이것은 당신이 원격 FTP 서버에 익명으로 로그인을 시도할 때 사용될 암호입"
-"니다"
+"이것은 당신이 원격 FTP 서버에 익명으로 로그인을 시도할 때 사용될 암호입니다"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "프록시 계정:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "여러분의 방화벽 계정입니다 (생략 가능l)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "프록시 서버 종류:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1039,34 +980,33 @@ msgid ""
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
 msgstr ""
-"프록시 서버에 로그인 하는 방법을 지정합니다. 여러분은 % 기호로 시작하는 "
-"두 글자의 변환 문자열을 지정할 수 있습니다. 이러한 변환 문자열은 이 후에 "
-"적절한 데이터로 변환될 것입니다. 첫 번째 문자는 프록시를 의미하는 p나 "
-"FTP 서버의 호스트를 의미하는 h가 될 수 있습니다. 두 번째 문자는 u (사용자), "
-"p (열쇠글), h (호스트), o (포트), a (계정) 중의 하나가 될 수 있습니다. 예를 "
-"들면, 프록시 사용자의 경우 %pu를 입력할 수 있습니다"
-
-#: ../lib/rfc959.c:69
+"프록시 서버에 로그인 하는 방법을 지정합니다. 여러분은 % 기호로 시작하는 두 글"
+"자의 변환 문자열을 지정할 수 있습니다. 이러한 변환 문자열은 이 후에 적절한 데"
+"이터로 변환될 것입니다. 첫 번째 문자는 프록시를 의미하는 p나 FTP 서버의 호스"
+"트를 의미하는 h가 될 수 있습니다. 두 번째 문자는 u (사용자), p (열쇠글), h "
+"(호스트), o (포트), a (계정) 중의 하나가 될 수 있습니다. 예를 들면, 프록시 사"
+"용자의 경우 %pu를 입력할 수 있습니다"
+
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV 주소를 무시"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"원격 FTP 서버의 PASV IP 주소 값을 무시하고, 호스트의 IP 주소를 "
-"대신 사용하도록 합니다. 이 옵션은 때때로 PASV 응답에 "
-"자신의 외부 IP 주소가 아닌 내부 IP 주소를 보내주는 라우터를 통하는 "
-"경우에 필요합니다."
+"원격 FTP 서버의 PASV IP 주소 값을 무시하고, 호스트의 IP 주소를 대신 사용하도"
+"록 합니다. 이 옵션은 때때로 PASV 응답에 자신의 외부 IP 주소가 아닌 내부 IP 주"
+"소를 보내주는 라우터를 통하는 경우에 필요합니다."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "수동 파일 전송"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1075,17 +1015,17 @@ 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
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "원격 심볼릭링크 분석 (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1096,15 +1036,16 @@ msgstr ""
 "이 옵션을 켜는 것이 좋습니다. 이 옵션을 꺼야 하는 경우는 원격 FTP 서버가 "
 "LIST 명령의 -L 옵션을 지원하지 않는 경우 뿐입니다"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "파일 아스키 모드로 보내기"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1113,271 +1054,322 @@ msgstr ""
 "스에서 유닉스로 파일을 송신할 경우에는 이 옵션을 꺼도 상관없습니다. 이진 데이"
 "타를 다운로딩하는 경우에는 이 옵션을 끄는 것이 좋을 것입니다."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "서버에서 잘못된 응답 '%c'을(를) 받았습니다.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: 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"
 
-#: ../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"
 
-#: ../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/sshv2.c:28
+#: 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 "소켓을 non-blocking으로 설정할 수 없습니다: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH 프로그램명:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH 실행파일에 대한 경로"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH 추가 파라미터:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH 프로그램에 추가로 넘길 파라미터"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH User/Pass 필요"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH 연결을 위한 사용자명/암호가 필요합니다"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "프로그램 실행: %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr ""
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "암호"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "암호"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(예/아니오)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "암호 입력"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID 암호 입력:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "에러: 틀린 암호가 입력되었습니다\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: 프로토콜 초기화\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: 프로토콜 버전 %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s 엽니다\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: 닫습니다\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: %s 디렉토리 엽니다\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: 디렉토리 읽습니다\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: %s 파일 삭제합니다\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: %s 디렉토리 생성합니다\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: %s 디렉토리를 삭제합니다\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: 파일 속성\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "확인"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "파일끝"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "그런 파일이나 디렉토리가 없습니다"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "허용되지 않습니다"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "실패"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "잘못된 메시지"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "연결 없음"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "연결 끊김"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "동작이 지원되지 않습니다"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "서버에서 모르는 메시지가 도착했습니다"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1385,41 +1377,41 @@ msgstr ""
 "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"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL 엔진"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL 엔트로피 파일:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL 엔트로피 파일:"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "엔트로피 시드 길이:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL 엔진에 주어질 시드의 최대 길이 (바이트)"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL Peer 검증"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1432,68 +1424,58 @@ msgstr ""
 "주제 = %s\n"
 "에러 %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Peer 증명서를 얻을 수 없습니다\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 "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
-"에러: SSL 증명서(%s) 내의 호스트와 연결한 호스트(%s)가 일치하지 않습니다. "
-"연결을 끊습니다.\n"
+"에러: SSL 증명서(%s) 내의 호스트와 연결한 호스트(%s)가 일치하지 않습니다. 연"
+"결을 끊습니다.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL 라이브러리를 초기화할 수 없습니다\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "기본적인 SSL 증명서 읽기 에러\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 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:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "에러: SSL 엔진이 초기화되지 않았습니다\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL 연결 설정 에러 (BIO 객체)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL 연결 설정 에러 (SSL 객체)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "peer 증명서 에러: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "동작이 취소되었습니다\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 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 ""
-">. 이 프로그램에 대해 어떤 질문이나 제안등이 있으시면, 저에게 주저없이 편지"
-"를 보내시기 바랍니다. gFTP에 대한 최근의 소식들은 제 웹 사이트 http://www.";
-"gftp.org/에서 항상 보실 수 있습니다\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 "
@@ -1503,73 +1485,73 @@ msgstr ""
 "은 자유 소프트웨어입니다, 그리고 특정한 조건하에서 재배포하시는 것은 좋습니"
 "다; 자세한 것은 COPYING 파일을 보십시요\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "번역자: 남성현 <goweol gmail 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 <모드> <파일>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "사용법: rename <이전 이름> <새 이름>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "사용법: delete <파일>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "사용법: rmdir <디렉토리>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "사용법: site <사이트 명령>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "사용법: mkdir <새 디렉토리>\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 <디렉토리>\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"
 
-#: ../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 [변수명 = 값]\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"
 
-#: ../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"
@@ -1577,324 +1559,323 @@ msgstr ""
 "지원되는 명령:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "사용법: %s <파일스펙>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "정보"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP 정보 보기"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "아스키"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "현재 파일 전송 모드를 *아스키*로 설정합니다 (FTP만)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "이진"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "현재 파일 전송 모드를 *이진*으로 설정합니다 (FTP만)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "원격 작업 디렉토리를 바꿉니다"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "전송된 파일의 속성을 저장"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "사용가능한 옵션들: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "원격 사이트에에서 끊습니다"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "원격 파일 삭제"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "현재 원격 디렉토리의 디렉토리 목록을 봅니다"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "원격 파일 다운로드"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "도움말"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "이 도움말 화면 보기"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "로컬 작업 디렉토리를 바꿉니다"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "로컬 파일의 모드를 바꿉니다"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "로컬 파일을 삭제합니다"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "현재 로컬 디렉토리의 디렉토리 목록을 봅니다"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "로컬 디렉토리를 만듭니다"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "현재의 로컬 디렉토리를 봅니다"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "로컬 파일명을 바꿉니다"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "로컬 디렉토리를 삭제합니다"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "원격 디렉토리를 만듭니다"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "로컬 파일 올리기"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "열기"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "원격 사이트로 연결합니다"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "현잭 원격 디렉토리를 봅니다"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP 끝내기"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "원격 파일명을 바꿉니다"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "원격 디렉토리를 삭제합니다"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "환경설정 파일 변수를 봅니다. 또한 'set var=val' 형식으로 변수값을 바꿀 수 있"
 "습니다"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "사이트"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "사이트 명령 입력"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 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 "
 "log for which items were not properly transferred."
 msgstr ""
-"%d 개의 파일 혹은 디렉토리의 전송에 실패하였습니다. "
-"어느 것이 전송되지 않았는지는 로그를 점검해 보시기 바랍니다."
+"%d 개의 파일 혹은 디렉토리의 전송에 실패하였습니다. 어느 것이 전송되지 않았는"
+"지는 로그를 점검해 보시기 바랍니다."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: 어떤 일이든 하시려면 일단 멈춤 단추를 누르십시요\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "책갈피 실행"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "책갈피 더하기: 책갈피의 이름을 입력하셔야만 합니다\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "책갈피 더하기: %s 책갈피가 이미 있어서 추가할 수 없습니다\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "책갈피 더하기"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "책갈피 더하기: 호스트 이름을 입력하셔야만 합니다\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1904,31 +1885,31 @@ msgstr ""
 "항목들을 하위메뉴에 집어넣으려면 / 로 분리하세요\n"
 "(가령: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "암호 기억"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "책갈피의 이름을 입력하셔야만 합니다."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "새 폴더"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "만들고자 하는 새로운 폴더의 이름을 입력하세요"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "새 항목"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "만들고자 하는 새로운 항목의 이름을 입력하세요"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1937,106 +1918,99 @@ msgstr ""
 "책갈피 %s와(과) 그 하위 항목들을\n"
 "정말로 지우고 싶으십니까?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "책갈피 지우기"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "책갈피"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "엔트리 편집"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "설명:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "호스트명:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "포트:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "프로토콜:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "원격 디렉토리:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "로컬 디렉토리:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "사용자명:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "암호:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "어카운트:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "익명으로 로그인"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  취소  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/파일/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/파일/새 폴더(_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/파일/새 항목(_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/파일/지우기(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/파일/등록정보(_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/파일/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/파일/닫기(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "책갈피 편집"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2044,91 +2018,90 @@ msgstr ""
 "이제 당신의 파일들의 속성을 바꾸실 수 있습니다\n"
 "주의: 모든 ftp 서버가 chmod 기능을 지원하지는 않습니다"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Special"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "사용자"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "읽기"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "쓰기"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "실행"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "그룹"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Other"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "이 %ld 파일들과 %ld 디렉토리들을 정말로 지우고 싶으십니까?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "이 %ld 파일들을 정말로 지우고 싶으십니까?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "이 %ld 디렉토리들을 정말로 지우고 싶으십니까?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "파일 지우기/디렉토리"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "지우기"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "연결"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s을(를) 받았습니다\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "드래그앤드롭"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "끝내기"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2136,468 +2109,455 @@ msgstr ""
 "전송중인 파일이 있습니다.\n"
 "정말로 끝내기를 원하십니까?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "위치 열기"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "연결할 URL을 입력하십시요"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/창 1(_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/창 2(_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/아스키(_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/이진(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/등록정보(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/종료(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/로컬(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/로컬/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/로컬/URL 열기(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/로컬/연결끊기(_I)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/로컬/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/로컬/파일스펙 바꾸기(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/로컬/선택된 파일 보기(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/로컬/모두 선택(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/로컬/모든 파일 선택"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/로컬/모두 선택해제"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/로컬/디렉토리 목록 저장..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/로컬/SITE 명령 보내기..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/로컬/디렉토리 바꾸기(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/로컬/모드바꾸기(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/파일/새 폴더(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/로컬/이름바꾸기(_M)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/로컬/지우기(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/로컬/편집(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/로컬/보기(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/로컬/새로 고침(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/원격(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/원격/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/원격/URL 열기(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/원격/연결끊기(_I)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/원격/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/원격/파일스펙 바꾸기(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/원격/선택된 파일 보기(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/원격/모두 선택(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/원격/모든 파일 선택"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/원격/모두 선택해제"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/원격/디렉토리 목록 저장..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/원격/SITE 명령 보내기..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/원격/디렉토리 바꾸기(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/원격/모드바꾸기(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/파일/새 폴더(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/원격/이름바꾸기(_M)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/원격/지우기(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/원격/편집(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/원격/보기(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/원격/새로 고침(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/책갈피(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/책갈피/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/책갈피/책갈피 더하기(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/책갈피/책갈피 편집"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/책갈피/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/전송(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/전송/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/전송/시작(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/전송/중지(_O)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/전송/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/전송/현재파일 건너뛰기(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/전송/파일 삭제(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/전송/파일 위로 이동(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/전송/파일 아래로 이동(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/전송/파일 받기(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/전송/파일 보내기(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/로깅(_O)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/로깅/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/로깅/지우기(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/로깅/보기(_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/로깅/로그 저장(_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/도구(_S)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/도구/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/도구/창 비교(_O)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/도구/캐쉬 비우기(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/도움말"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/도움말/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/도움말/이 프로그램은(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "호스트: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "호스트(_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "포트: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "사용자: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "사용자(_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "비밀번호: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "명령: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "파일 이름"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "크기"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "날짜"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "속성"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "진행"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "에러: 연결하려면 호스트명을 입력하셔야 합니다\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "재생"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "사용자명 입력"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "이 사이트에 대한 사용자명을 입력하세요"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:586 ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "이 사이트에 대한 암호를 입력하세요"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "동작이 취소되었습니다...문자열을 입력하셔야 합니다\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "디렉토리 생성"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "만들 디렉토리명을 입력하십시요"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "이름변경"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s을(를) 어떤 이름으로 바꾸고 싶으세요?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "사이트"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "사이트 명령 입력"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "덮어쓰기"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "이어받기"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "건너뛰기"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "동작"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "파일 보내기"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2605,60 +2565,59 @@ msgstr ""
 "다음 파일(들)이 로컬과 리모트 컴퓨터에 모두 존재합니다\n"
 "원하는 것을 선택하십시요"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "에러"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "파일 건너뛰기"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "모두 선택"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "모두 선택해제"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "파일스펙 바꾸기: 동작이 취소되었습니다...문자열을 입력하셔야 합니다\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "파일스펙 바꾸기"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "에러: %s을(를) 쓰기위해 열 수 없습니다: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "디렉토리 목록 저장"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "에러: %s에 쓸 수 없습니다: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "로그파일을 %s에 성공적으로 저장했습니다\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "로그 저장"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2667,11 +2626,11 @@ msgstr ""
 "라이선스 동의 파일 COPYING을 찾을 수 없습니다. 이 파일이 %s 혹은 %s에 있어야 "
 "합니다"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP 정보"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2681,102 +2640,81 @@ msgstr ""
 "%s\n"
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "공식 홈페이지: http://www.gftp.org/\n";
-""
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "정보"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "라이선스 동의"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  닫기  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "창 비교"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "원격 서버에서 끊었습니다"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
-"흐스트 영역에 지정된 사이트에 연결합니다. 만약 호스트 영역이 비어있다면, "
-"대화 상자가 나타나며, 연결할 URL을 입력할 수 있습니다."
+"흐스트 영역에 지정된 사이트에 연결합니다. 만약 호스트 영역이 비어있다면, 대"
+"화 상자가 나타나며, 연결할 URL을 입력할 수 있습니다."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "모든 파일"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (캐쉬됨) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "연결 안됨"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "파일 %s을(를) 열 수 없습니다: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: 리모트 사이트에 연결되지 않았습니다\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: 이 기능은 이 프로토콜을 사용할 수 없습니다\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: 한 항목만 선택하셔야 합니다\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: 적어도 한 항목은 선택하셔야 합니다\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "바꾸기"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "더하기"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "취소"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  예  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  아니오  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "디렉토리 목록을 받는 중"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  중지  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2785,109 +2723,89 @@ msgstr ""
 "%ld 디렉토리들과 %ld 파일들을\n"
 "받았습니다"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP 에러: 파일 %s을(를) %s 혹은 %s에서 찾을 수 없습니다\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "호스트 편집"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "호스트 더하기"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "형식:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "형식(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "도메인"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "네트워크 주소"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "네트워크 주소(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "넷마스크"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "넷마스크(_E):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "도메인(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "넷마스크"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "로컬 호스트"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "편집"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "옵션"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "적용"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 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 "연결중..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "파일 받기: 리모트 사이트에 연결되지 않았습니다\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "에러: 자식 %d이(가) %d을(를) 되돌렸습니다\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "자식 %d이(가) 성공적으로 수행되었습니다\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "에러: 자식 %d이(가) 정상적으로 종료되지 않았습니다\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "에러: 파일 %s에 대한 정보를 얻을 수 없습니다: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "%s 파일이 바뀌지 않았습니다\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2896,118 +2814,169 @@ msgstr ""
 "%s 파일이 바뀌었습니다.\n"
 "업로드할까요?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 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 of %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 "받기 %s of %s - 속도: %.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 "보내기 %s of %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 of %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 남음. (예상 시간) (파일 %ld / %ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 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"
 
-#: ../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:34
+msgid "Edit"
+msgstr "편집"
+
+#: 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 "보기: 다른 프로세스를 생성(fork)할 수 없습니다: %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:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s을(를) %s와 함께 여는 중\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s 파일 보는 중\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "보기: 파일 %s을(를) 열 수 없습니다: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "터미널 %s을(를) 열 수 없습니다\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "사용자명 [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s이(가) 이미 있습니다. (%s 원본크기, %s 대상크기):\n"
 "덮어쓰기(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 ""
+#~ ">. 이 프로그램에 대해 어떤 질문이나 제안등이 있으시면, 저에게 주저없이 편"
+#~ "지를 보내시기 바랍니다. gFTP에 대한 최근의 소식들은 제 웹 사이트 http://";
+#~ "www.gftp.org/에서 항상 보실 수 있습니다\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  취소  "
+
+#~ msgid "Host: "
+#~ msgstr "호스트: "
+
+#~ msgid "User: "
+#~ msgstr "사용자: "
+
+#~ msgid "  Close  "
+#~ msgstr "  닫기  "
+
+#~ msgid "Add"
+#~ msgstr "더하기"
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
+#~ msgid "  Yes  "
+#~ msgstr "  예  "
+
+#~ msgid "  No  "
+#~ msgstr "  아니오  "
+
+#~ msgid "Type:"
+#~ msgstr "형식:"
+
+#~ msgid "Network Address"
+#~ msgstr "네트워크 주소"
+
+#~ msgid "_Edit"
+#~ msgstr "편집(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "적용"
+
 #~ msgid "Startup Directory:"
 #~ msgstr "시작 디렉토리:"
 
diff --git a/po/lt.po b/po/lt.po
index 4a1be98..3959f94 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,95 +3,101 @@
 # This file is distributed under the same license as the gftp package.
 # Justina Klingaitė <justina klingaitė gmail com>, 2006.
 # Žygimantas Beručka <zygis gnome org>, 2006.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 17:21+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2006-03-31 17:22+0300\n"
 "Last-Translator: Žygimantas Beručka <zygis gnome org>\n"
 "Language-Team: Lithuanian <komp_lt konferencijos lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Netinkamas URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Klaida: Netinkama eilutė %s podėlio rodyklės rinkmenoje\n"
 
-#: ../lib/cache.c:137 ../lib/fsp.c:537 ../lib/local.c:477
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Klaida: Nepavyko sukurti aplanko %s: %s\n"
 
-#: ../lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Klaida: Nepavyko sukurti laikinosios rinkmenos: %s\n"
 
-#: ../lib/cache.c:183 ../lib/cache.c:232 ../lib/config_file.c:157
-#: ../lib/config_file.c:163 ../lib/local.c:102 ../lib/local.c:217
-#: ../lib/rfc2068.c:259 ../lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Klaida užveriant rinkmenos aprašą: %s\n"
 
-#: ../lib/cache.c:250 ../lib/fsp.c:128 ../lib/fsp.c:208 ../lib/local.c:136
-#: ../lib/local.c:145 ../lib/local.c:192
+#: 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 ""
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3000
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Klaida: Nepavyko atverti vietinės rinkmenos %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2707 ../lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Klaida: Nepavyko įrašyti į lizdą: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2631 ../lib/sshv2.c:364
-#: ../lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Klaida: Nepavyko perskaityti iš lizdo: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP klaida: Blogas žymelės rinkmenos vardas %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Dėmesio: Nepavyko rasti pagrindinės žymelių rinkmenos %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP klaida: Nepavyko atverti žymelės rinkmenos %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP įspėjimas: Eilutė %d žymelių rinkmenoje praleidžiama: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP įspėjimas: Eilutėje %d nepakanka argumentų\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 "
@@ -102,7 +108,7 @@ msgstr ""
 "Sintaksė: dont_use_proxy=.domain arba dont_use_proxy=network skaičius/tinklo "
 "kaukė"
 
-#: ../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"
@@ -110,62 +116,63 @@ msgstr ""
 "priev=rinkmena prievardis:XPM rinkmena:Ascii arba Binary (A or B):viewer "
 "programa. Pastaba: visi argumentai išskyrus rinkmenos plėtinį yra neprivalomi"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP klaida: Blogas konfigūracijos rinkmenos pavadinimas %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP klaida: Nepavyko sukurti aplanko %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP klaida: Nepavyko rasti pagrindinės konfigūracijos rinkmenos %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ar atlikote „make install“?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP klaida: Nepavyko atverti konfigūracijos rinkmenos %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Nutraukiama, dėl apdorojimo klaidų konfigūracijos rinkmenoje eilutėje %d\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP įspėjimas: Praleidžiama eilutė %d konfigūracijos rinkmenoje: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP klaida: Blogas prisijungimo rinkmenos pavadinimas%s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP įspėjimas: Nepavyko atverti %s rašymui: %s\n"
 
-#: ../lib/config_file.c:732
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 žymelių rinkmena. Autorinės teisės priklauso © 1998-2003 Brian Masney "
 "<masneyb gftp org>. Perspėjimas: visi komentarai, kuriuos įrašysite į šią "
 "rinkmeną, bus PERRAŠYTI."
 
-#: ../lib/config_file.c:733
+#: 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,208 +180,218 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:845
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 žymelių rinkmena. Autorinės teisės priklauso © 1998-2003 Brian Masney "
+"<masneyb gftp org>. Perspėjimas: visi komentarai, kuriuos įrašysite į šią "
+"rinkmeną, bus PERRAŠYTI."
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:383 ../lib/protocols.c:455
-#: ../lib/protocols.c:526 ../lib/rfc2068.c:545 ../lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nežinoma>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "LEMTINGA gFTP klaida: konfigūracijos parametras „%s“ nerastas globalioje "
 "maišos lentelėje\n"
 
-#: ../lib/fsp.c:190
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Klaida: Nepavyko įkelti rinkmenos %s\n"
 
-#: ../lib/fsp.c:200
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Klaida: Nepavyko įrašyti į rinkmeną %s: %s\n"
 
-#: ../lib/fsp.c:238
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Klaida: Klaida užveriant rinkmeną: %s\n"
 
-#: ../lib/fsp.c:326
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Sugadintas rinkmenų sąrašas iš FSP serverio %s\n"
 
-#: ../lib/fsp.c:338 ../lib/fsp.c:339 ../lib/protocols.c:1541
-#: ../lib/protocols.c:1542 ../lib/protocols.c:1583 ../lib/protocols.c:1584
-#: ../lib/protocols.c:1647 ../lib/protocols.c:1654 ../lib/protocols.c:1730
-#: ../lib/protocols.c:1731 ../lib/protocols.c:1767
+#: 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 "nežinoma"
 
-#: ../lib/fsp.c:376
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nepavyko gauti FSP aplankų sąrašo %s: %s\n"
 
-#: ../lib/fsp.c:438
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Aplankas sėkmingai pakeistas į %s\n"
 
-#: ../lib/fsp.c:448
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nepavyko pakeisti aplanko į %s\n"
 
-#: ../lib/fsp.c:473 ../lib/fsp.c:502 ../lib/local.c:424 ../lib/local.c:447
-#: ../src/gtk/transfer.c:260 ../src/gtk/view_dialog.c:328
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Sėkmingai pašalinta %s\n"
 
-#: ../lib/fsp.c:479 ../lib/local.c:430
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Klaida: Nepavyko pašalinti aplanko %s: %s\n"
 
-#: ../lib/fsp.c:508 ../lib/local.c:453 ../src/gtk/transfer.c:264
-#: ../src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Klaida: Nepavyko pašalinti rinkmenos %s: %s\n"
 
-#: ../lib/fsp.c:530 ../lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Aplankas %s sukurtas sėkmingai\n"
 
-#: ../lib/fsp.c:565 ../lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Sėkmingai pervadinta %s į %s\n"
 
-#: ../lib/fsp.c:577 ../lib/local.c:503
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Klaida: nepavyko pervadinti %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 nepalaikomas, nes neįkompiliuotas SSL palaikymas. Ryšys nutraukiamas.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 "HTTPS nepalaikomas, nes neįkompiliuotas SSL palaikymas. Ryšys nutraukiamas.\n"
 
-#: ../lib/local.c:71 ../lib/local.c:407
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Nepavyko pakeisti vietinio aplanko į %s: %s\n"
-
-#: ../lib/local.c:85 ../lib/local.c:392
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nepavyko gauti esamo aplanko: %s\n"
 
-#: ../lib/local.c:183
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Vietinis aplankas sėkmingai pakeistas į %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Nepavyko pakeisti vietinio aplanko į %s: %s\n"
+
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Klaida: nepavyko nutraukti vietinės rinkmenos %s: %s\n"
 
-#: ../lib/local.c:347
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nepavyko gauti vietinių aplankų sąrašo %s: %s\n"
 
-#: ../lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Vietinis aplankas sėkmingai pakeistas į %s\n"
-
-#: ../lib/local.c:520
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s režimas sėkmingai pakeistas į %o\n"
 
-#: ../lib/local.c:527
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Klaida: nepavyko pakeisti %s režimo į %o: %s\n"
 
-#: ../lib/local.c:623
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Aplankas sėkmingai pakeistas į %s\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Klaida: nepavyko pakeisti %s režimo į %o: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "vietinė rinkmenų sistema"
 
-#: ../lib/misc.c:401
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "naudojama: gftp"
 
-#: ../lib/misc.c:401 ../lib/rfc2068.c:303 ../src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../lib/options.h:24 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nėra"
 
-#: ../lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "rinkmena"
 
-#: ../lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "dydis"
 
-#: ../lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "naudotojas"
 
-#: ../lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "grupė"
 
-#: ../lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "data, laikas"
 
-#: ../lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "požymiai"
 
-#: ../lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "mažėjančiai"
 
-#: ../lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "didėjančiai"
 
-#: ../lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Bendri"
 
-#: ../lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Peržiūros programa:"
 
-#: ../lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -382,35 +399,27 @@ msgstr ""
 "Numatytoji programa naudojama peržiūrėti rinkmenoms. Jei ji nenurodyta, bus "
 "naudojama vidinė žiūryklė."
 
-#: ../lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Redagavimo programa:"
 
-#: ../lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Numatytoji programa naudojama redaguoti rinkmenoms."
 
-#: ../lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Pradinis aplankas:"
-
-#: ../lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Pradinis gFTP atveriamas aplankas"
-
-#: ../lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maksimalus žurnalo lango dydis:"
 
-#: ../lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maksimalus žurnalo lango dydis baitais GTK+ versijai"
 
-#: ../lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Nutolusių simbolių rinkiniai:"
 
-#: ../lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -418,11 +427,11 @@ msgstr ""
 "Tai kableliu atskirtų koduočių, naudojamų bandant konvertuoti serverio "
 "žinutes į vietinę lokalę, sąrašas"
 
-#: ../lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Nutolęs LC_TIME:"
 
-#: ../lib/options.h:55
+#: lib/options.h:58
 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."
@@ -430,557 +439,506 @@ msgstr ""
 "Tai nutolusio serverio LC_TIME reikšmė. Tai reikalinga norint teisingai "
 "apdoroti aplankų datas."
 
-#: ../lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Podėlio TTL:"
 
-#: ../lib/options.h:60
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Laikas sekundėmis kiek saugoti podėlio įrašus prieš jiems baigiant galioti."
 
-#: ../lib/options.h:63
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: ../lib/options.h:65
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: ../lib/options.h:66
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Vienu metu siųsti tik vieną rinkmeną"
 
-#: ../lib/options.h:68
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Ar vienu metu siųsti tik vieną rinkmeną?"
 
-#: ../lib/options.h:69
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr ""
 
-#: ../lib/options.h:72
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: ../lib/options.h:74
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Nekeisti rinkmenų leidimų"
 
-#: ../lib/options.h:77
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Nekeisti atsiųstų rinkmenų leidimų"
 
-#: ../lib/options.h:79
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Nekeisti rinkmenų datos"
 
-#: ../lib/options.h:82
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Nekeisti atsiųstų rinkmenų datos"
 
-#: ../lib/options.h:84
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Atnaujinti vaizdą po kiekvieno siuntimo"
 
-#: ../lib/options.h:87
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Atnaujinti sąrašo langą po kiekvieno rinkmenos siuntimo"
 
-#: ../lib/options.h:89
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Rūšiuoti aplankus pradžioje"
 
-#: ../lib/options.h:92
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Rodyti aplankus pirmiau nei rinkmenas"
 
-#: ../lib/options.h:93
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Rodyti paslėptas rinkmenas"
 
-#: ../lib/options.h:96
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Rodyti languose paslėptas rinkmenas"
 
-#: ../lib/options.h:97
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Lango antraštėje rodyti siuntimo būseną"
 
-#: ../lib/options.h:99
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Lango antraštėje rodyti siuntimo būseną"
 
-#: ../lib/options.h:100
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Pradėti siųsti rinkmenas"
 
-#: ../lib/options.h:102
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Automatiškai pradėti siųsti rinkmenas, kai jos įdedamos į eilę"
 
-#: ../lib/options.h:104
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI leisti naudoti rankines komandas"
 
-#: ../lib/options.h:106
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Grafinėje sąsajoje leisti įvesti rankines komandas (veikia kaip tekstinė "
 "versija)"
 
-#: ../lib/options.h:108 ../src/gtk/options_dialog.c:1023
-#: ../src/gtk/options_dialog.c:1243
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Pašalinti vietinį aplanką"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Atsijungti iš nutolusio serverio"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Tinklas"
 
-#: ../lib/options.h:110
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: ../lib/options.h:113
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Pakartotiniai bandymai prisijungti:"
 
-#: ../lib/options.h:118
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: ../lib/options.h:120
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: ../lib/options.h:123
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: ../lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maksimalus KB/S:"
 
-#: ../lib/options.h:127
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: ../lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr ""
 
-#: ../lib/options.h:132
+#: lib/options.h:144
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:135
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Numatytasis protokolas:"
 
-#: ../lib/options.h:137
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Čia nurodomas numatytasis naudojamas protokolas"
 
-#: ../lib/options.h:139 ../lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Įjungti IPv6 palaikymą"
 
-#: ../lib/options.h:147
+#: lib/options.h:159
 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 ""
 
-#: ../lib/options.h:150
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: ../lib/options.h:153
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: ../lib/options.h:156
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: ../lib/options.h:159
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: ../lib/options.h:162
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: ../lib/options.h:165
+#: 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 ""
 
-#: ../lib/options.h:173 ../lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: ../lib/options.h:176 ../lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Rūšiuoti didėjimo arba mažėjimo tvarka"
 
-#: ../lib/options.h:186 ../lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: ../lib/options.h:189 ../lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:192 ../lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:195 ../lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:198 ../lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:201 ../lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:222
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Komandų spalva, kurios yra siunčiamos į serverį"
 
-#: ../lib/options.h:225
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Komandų spalva, kurios yra gaunamas iš serverio"
 
-#: ../lib/options.h:228
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Klaidų žinučių spalva"
 
-#: ../lib/options.h:231
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Likusių prisijungimo žinučių spalva"
 
-#: ../lib/options.h:237 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:240 ../lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:245 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:248 ../lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr "Vietinis"
 
-#: ../lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:257 ../src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Žymelė"
 
-#: ../lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: ../lib/protocols.c:379
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:390
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Įkeliamas aplankų spaudinys %s iš talpyklos (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:400
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Įkeliamas aplankų spaudinys %s iš serverio (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:454 ../lib/protocols.c:486 ../lib/protocols.c:525
-#: ../lib/protocols.c:557
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-
-#. Don't use request->logging_function since the strings must be in UTF-8
-#. for the GTK+ 2.x port
-#: ../lib/protocols.c:469
-#, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
-msgstr "Klaida konvertuojant užrašą %s į UTF-8 iš esamos lokalės: %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:540
-#, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr "Klaida konvertuojant užrašą %s iš UTF-8 į esamą lokalę:  %s\n"
-
-#: ../lib/protocols.c:629
+#: lib/protocols.c:450
 #, 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:647
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Klaida: Nepavyko įrašyti į talpyklą: %s\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Klaida: Nepavyko rasti žymelės %s\n"
 
-#: ../lib/protocols.c:687
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Žymelių klaida: Žymelės įrašas %s neturi kompiuterio vardo\n"
 
-#: ../lib/protocols.c:826 ../lib/protocols.c:853
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokolas „%s“ šiuo metu nepalaikomas.\n"
 
-#: ../lib/protocols.c:1167 ../lib/protocols.c:1182 ../lib/protocols.c:2214
-#: ../lib/protocols.c:2324
+#: lib/protocols.c:1153
 #, c-format
-msgid "Looking up %s\n"
-msgstr "Ieškoma %s\n"
-
-#: ../lib/protocols.c:1173 ../lib/protocols.c:1188 ../lib/protocols.c:2219
-#: ../lib/protocols.c:2329
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Nepavyko surasti kompiuterio vardo %s: %s\n"
-
-#: ../lib/protocols.c:2237
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Nepavyko sukurti lizdo: %s\n"
-
-#: ../lib/protocols.c:2243 ../lib/protocols.c:2346
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Bandoma %s:%d\n"
-
-#: ../lib/protocols.c:2248 ../lib/protocols.c:2353
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Nepavyko prisijungti prie %s: %s\n"
-
-#: ../lib/protocols.c:2283 ../lib/rfc959.c:640
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2307 ../lib/sshv2.c:1046
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:2369 ../lib/protocols.c:3009 ../lib/rfc959.c:649
-#: ../lib/rfc959.c:826
+#: lib/protocols.c:1531
 #, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2376
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Susisiekta su %s:%d\n"
-
-#: ../lib/protocols.c:2607 ../lib/protocols.c:2682 ../lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: ../lib/protocols.c:2750
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2764
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: ../lib/protocols.c:2899
+#: lib/protocols.c:1539
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: ../lib/protocols.c:2907
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:297
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nepavyko atverti pagrindinės pty %s: %s\n"
 
-#: ../lib/pty.c:305
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nepavyko sukurti lizdų poros: %s\n"
 
-#: ../lib/pty.c:334
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Klaida: Nepavyksta vykdyti ssh: %s\n"
 
-#: ../lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nepavyko atšakoti kito proceso: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Tarpinio kompiuterio vardas:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Ugniasienės kompiuterio vardas"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Tarpinio kompiuterio prievadas"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Tarpinio kompiuterio naudotojo vardas:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Jūsų ugniasienės naudotojo vardas"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Tarpinio kompiuterio slaptažodis:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Jūsų ugniasienės slaptažodis"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Naudoti HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Ar norite naudoti HTTP/1.1 ar HTTP/1.0"
 
-#: ../lib/rfc2068.c:150 ../lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:254 ../lib/rfc959.c:608 ../lib/sshv2.c:1123
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Atsijungiama nuo svetainės %s\n"
 
-#: ../lib/rfc2068.c:303
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: ../lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nepavyksta atstatyti rinkmenos %s\n"
 
-#: ../lib/rfc2068.c:423 ../lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Gaunamas aplankų sąrašas...\n"
 
-#: ../lib/rfc2068.c:819 ../lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Gautas blogas atsakymas iš serverio, atjungiama\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SIDE komanda"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "naudotojas kompiuteris"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "naudotojas kompiuteris:prievadas"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTIFIKUOTI"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "naudotojas kompiuteris prievadas"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "naudotojas kompiuteris NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP tarpinis kompiuteris"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Prisitaikytas"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 #, fuzzy
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
@@ -989,19 +947,19 @@ msgstr ""
 "Tai yra slaptažodis, kuris bus naudojamas, kada Jūs tik  prisijungsite prie "
 "nutolusio FTP serverio kaip anonimas"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Tarpinio kompiuterio abonementas:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Jūsų ugniasienės abonementas (nebūtina)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tarpinio kompiuterio serverio tipas:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1012,11 +970,11 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignoruoti PASV adresą"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1024,11 +982,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasyvūs rinkmenų siuntimai"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1038,11 +996,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1050,324 +1008,375 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Siusti rinkmenas ASCII režimu"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: ../lib/rfc959.c:322 ../lib/rfc959.c:331 ../lib/rfc959.c:342
-#: ../lib/rfc959.c:789 ../lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Iš serverio gautas netinkamas atsakas „%c“.\n"
 
-#: ../lib/rfc959.c:679 ../lib/rfc959.c:689
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:715
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 
-#: ../lib/rfc959.c:726 ../lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Nepavyksta sukurti duomenų ryšio: %s\n"
 
-#: ../lib/rfc959.c:738 ../lib/rfc959.c:759 ../lib/rfc959.c:912
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:749 ../lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:768 ../lib/rfc959.c:921
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:817
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:837
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:865 ../lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nepavyko priimti ryšio iš serverio: %s\n"
 
-#: ../lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "suma"
 
-#: ../lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Ieškoma %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 "Nepavyko surasti kompiuterio vardo %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Nepavyko sukurti lizdo: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Bandoma %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 "Nepavyko prisijungti prie %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Susisiekta su %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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr ""
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr ""
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr ""
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: ../lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Paleidžiama programa %s\n"
 
-#: ../lib/sshv2.c:307
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: ../lib/sshv2.c:308
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr ""
 
-#: ../lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: ../lib/sshv2.c:310
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "slaptažodis"
 
-#: ../lib/sshv2.c:414
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(taip/ne)?"
 
-#: ../lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr ""
 
-#: ../lib/sshv2.c:436 ../src/gtk/gtkui.c:118 ../src/gtk/transfer.c:554
-#: ../src/gtk/transfer.c:564
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Įvesti slaptažodį"
 
-#: ../lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Įvesti apsaugos ID slaptažodį:"
 
-#: ../lib/sshv2.c:487
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Klaida: Buvo įvestas neteisingas slaptažodis\n"
 
-#: ../lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: ../lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokolo versija %d\n"
 
-#: ../lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Atidaryti %s\n"
 
-#: ../lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Uždaryti\n"
 
-#: ../lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Atverti aplanką %s\n"
 
-#: ../lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Skaityti aplanką\n"
 
-#: ../lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Pašalinti rinkmeną %s\n"
 
-#: ../lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Sukurti aplanką %s\n"
 
-#: ../lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Pašalinti aplanką %s\n"
 
-#: ../lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Rinkmenos požymiai\n"
 
-#: ../lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Statusas %s\n"
 
-#: ../lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:609 ../src/gtk/bookmarks.c:1045 ../src/gtk/bookmarks.c:1298
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:368
-#: ../src/gtk/misc-gtk.c:1011 ../src/gtk/options_dialog.c:1208
-#: ../src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "GERAI"
 
-#: ../lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:615
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Nėra tokios rinkmenos ar aplanko"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Leidimas atmestas"
 
-#: ../lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Nesėkmė"
 
-#: ../lib/sshv2.c:624
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Bloga žinutė"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nėra ryšio"
 
-#: ../lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Ryšys prarastas"
 
-#: ../lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operacija nepalaikoma"
 
-#: ../lib/sshv2.c:636
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Nežinoma žinutė gražinta iš serverio"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Klaida: Žinutės dydis %d per didelis\n"
 
-#: ../lib/sshv2.c:730 ../lib/sshv2.c:1225 ../lib/sshv2.c:1821
-#: ../lib/sshv2.c:1959
+#: 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 "Klaida: Žinutės dydis %d iš serverio per didelis\n"
 
-#: ../lib/sshv2.c:736
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Atveriamas SSH ryšys %s\n"
 
-#: ../lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, fuzzy, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Sėkmingai prisijungta į SSH serverį %s "
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL variklis"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr ""
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr ""
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr ""
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1376,136 +1385,129 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:342 ../lib/sslcommon.c:416 ../lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Klaida nustatant SSL ryšį (BIO objektas)\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Klaida nustatant SSL ryšį (SSL objektas)\n"
 
-#: ../lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:91
-#, fuzzy, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Laukiama %d sekundžių bandant prisjungti vėl\n"
-
-#: ../src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operacija atšaukta\n"
 
-#: ../src/uicommon/gftpui.c:190
-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 ""
+#: src/uicommon/gftpui.c:65
+#, fuzzy, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Laukiama %d sekundžių bandant prisjungti vėl\n"
 
-#: ../src/uicommon/gftpui.c:191
+#: 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 ""
 
-#: ../src/uicommon/gftpui.c:193 ../src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Išvertė Justina Klingaitė ir Žygimantas Beručka"
 
-#: ../src/uicommon/gftpui.c:240 ../src/uicommon/gftpui.c:282
-#: ../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:872
+#: 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 "Klaida: Nesusisiekta su nutolusiu puslapiu\n"
 
-#: ../src/uicommon/gftpui.c:251
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "naudojama: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "naudojama: pervadinti  <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "naudojama: ištrinti <file>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "naudojama: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "naudojama: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:469 ../src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "naudojama: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Netinkamas argumentas\n"
 
-#: ../src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Išvalyti aplanko talpyklą\n"
 
-#: ../src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "naudojama: atidaryti "
 
-#: ../src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:754
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:836
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1513,1182 +1515,1204 @@ msgstr ""
 "Palaikomos komandos:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "naudojama: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Rodo gFTP informaciją"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:971 ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Pakeičia nutolusios rinkmenos leidimus"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Galimi pasirinkimai: talpykla"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Atjungia nuo nutolusios svetainės"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Pašalina nutolusią rinkmeną"
 
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:983 ../src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:985 ../src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Parsiunčia nutolusią rinkmeną(-as)"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Rodo šį pagalbos ekraną"
 
-#: ../src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:989 ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Pakeičia vietinį dirbantį aplanką"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Pakeičia vietinės rinkmenos leidimus"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Pašalina vietinę rinkmeną"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:997 ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Sukuria vietinį aplanką"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Rodyti esamą vietinį aplanką"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Pervadinti vietinę rinkmeną"
 
-#: ../src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Pašalinti vietinį aplanką"
 
-#: ../src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Sukuria nutolusį aplanką"
 
-#: ../src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:1015 ../src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Nusiunčia vietinę rinkmeną(-as)"
 
-#: ../src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Atveria susijungimą su nutolusia svetaine"
 
-#: ../src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Rodyti esamą nutolusį aplanką"
 
-#: ../src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Išeiti iš gFTP"
 
-#: ../src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Pervadinti nutolusią rinkmeną"
 
-#: ../src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Pašalinti nutolusį aplanką"
 
-#: ../src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1031
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Klaida: Komanda neatpažinama\n"
 
-#: ../src/uicommon/gftpui.c:1375
-msgid "Error: Remote site disconnected after trying to transfer file\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Nepavyko įkelti %s iš %s\n"
+msgid "Skipping file %s on host %s\n"
+msgstr ""
 
-#: ../src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
+msgid "Stopping the transfer on host %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Nepavyko įkelti %s iš %s\n"
+
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "There was an error transfering the file %s"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:213
-#: ../src/gtk/gftp-gtk.c:1063 ../src/gtk/misc-gtk.c:512
-#: ../src/gtk/misc-gtk.c:520
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Paleisti žymelę"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Pridėti žymelę: Jūs turite įvesti pavadinimą žymelei\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Pridėti žymelę: Nepavyko pridėti žymelės %s, nes šis pavadinimas jau "
 "egzistuoja\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Pridėti žymelę"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Prisiminti slaptažodį"
 
-#: ../src/gtk/bookmarks.c:473 ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Pridėti žymelę: Jūs turite įvesti pavadinimą žymelei\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Naujas aplankas"
 
-#: ../src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/File/Naujas elementas..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:557
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
-msgstr ""
+"%s and all its children?"
+msgstr "Ar tikrai norite ištrinti šias %ld rinkmenas ir %ld aplankus"
 
-#: ../src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Ištrinti žymelę"
 
-#: ../src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Žymelės"
 
-#: ../src/gtk/bookmarks.c:850 ../src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Redaguoti įrašą"
 
-#: ../src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: ../src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Kompiuterio vardas:"
 
-#: ../src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: ../src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokolas:"
 
-#: ../src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Nutolęs aplankas:"
 
-#: ../src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Vietinis aplankas:"
 
-#: ../src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: ../src/gtk/bookmarks.c:1003 ../src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Abonementas:"
 
-#: ../src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Prisijungti kaip ANONIMAS"
 
-#: ../src/gtk/bookmarks.c:1056 ../src/gtk/bookmarks.c:1309
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:380
-#: ../src/gtk/options_dialog.c:1219 ../src/gtk/options_dialog.c:1453
-msgid "  Cancel  "
-msgstr " Atšaukti"
-
-#: ../src/gtk/bookmarks.c:1065 ../src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Pritaikyti"
-
-#: ../src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Rinkmena"
 
-#: ../src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/File/Naujas aplankas..."
 
-#: ../src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/File/Naujas elementas..."
 
-#: ../src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/File/Ištrinti"
 
-#: ../src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/File/Savybės..."
 
-#: ../src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/File/Užverti"
 
-#: ../src/gtk/bookmarks.c:1240 ../src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Redaguoti žymeles"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Specialus"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Kibus"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Naudotojas"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Skaityti"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Rašyti"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupė"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Kita"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Ar tikrai norite ištrinti šias %ld rinkmenas ir %ld aplankus"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Ar tikrai norite ištrinti šias %ld rinkmenas"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Ar tikrai norite ištrinti šiuos %ld aplankus"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Ištrinti rinkmenas/aplankus"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1064 ../src/gtk/misc-gtk.c:946
-#: ../src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Prisijungti"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Gautas URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Išeiti"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr ""
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Nustatymai"
 
-#: ../src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "Atverti URL"
-
-#: ../src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Langas 1"
 
-#: ../src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Langas 2"
 
-#: ../src/gtk/gftp-gtk.c:250 ../src/gtk/gftp-gtk.c:255
-#: ../src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: ../src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binarinis"
 
-#: ../src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Nustatymai..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/File/Savybės..."
 
-#: ../src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Išeiti"
 
-#: ../src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Vietinis"
 
-#: ../src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Local/Atverti URL..."
 
-#: ../src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Local/Atsijungti"
 
-#: ../src/gtk/gftp-gtk.c:264 ../src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
+msgstr "/Local/Pakeisti aplanką"
 
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
-msgstr ""
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
+msgstr "/Remote/Rodyti pažymėtą"
 
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "/Remote/Pažymėti viską"
 
-#: ../src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Local/Pakeisti aplanką"
 
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Local/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Local/Sukurti aplanką..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/File/Naujas aplankas..."
 
-#: ../src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Local/Pervadinti..."
 
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Local/Ištrinti..."
 
-#: ../src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Local/Keisti..."
 
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Local/Žiūrėti..."
 
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Local/Atnaujinti"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Nutolęs"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Remote/Atverti _URL..."
 
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Remote/Atsijungti"
 
-#: ../src/gtk/gftp-gtk.c:287 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Remote/Rodyti pažymėtą"
 
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Remote/Pažymėti viską"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remote/Pažymėti visas rinkmenas"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remote/Nepažymėti jokių"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remote/Išsaugoti aplankų sąrašą..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
+msgstr "/Local/Pakeisti aplanką"
 
-#: ../src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/File/Naujas aplankas..."
 
-#: ../src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
+msgstr "/Remote/Atverti _URL..."
 
-#: ../src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
+msgstr "/Local/Ištrinti..."
 
-#: ../src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
+msgstr "/Remote/Atverti _URL..."
 
-#: ../src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
+msgstr "/Remote/Atverti _URL..."
 
-#: ../src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Ž_ymelės"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
-msgstr ""
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
+msgstr "Pridėti žymelę"
 
-#: ../src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
-msgstr ""
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
+msgstr "Redaguoti žymeles"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Siuntimai"
 
-#: ../src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Transfers/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/Transfers/Pradėti siuntimą"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Transfers/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/Transfers/Sustabdyti siuntimą"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Transfers/sep"
 
-#: ../src/gtk/gftp-gtk.c:315 ../src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Transfers/sep"
 
-#: ../src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Transfers/Praleisti esamą rinkmeną"
 
-#: ../src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Transfers/Pašalinti rinkmeną"
 
-#: ../src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Transfers/Pakelti rinkmeną aukštyn"
 
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Transfers/Nuleisti rinkmeną žemyn"
 
-#: ../src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfers/Gauti rinkmenas"
 
-#: ../src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Transfers/Padėti rinkmenas"
 
-#: ../src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/Ž_urnalas"
 
-#: ../src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Logging/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Logging/Išvalyti"
 
-#: ../src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
 msgstr "/Logging/Žiūrėti žurnalą"
 
-#: ../src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Logging/Išsaugoti žurnalą..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Įra_nkiai"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Tools/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/Palyginti langus"
 
-#: ../src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
-msgstr ""
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
+msgstr "/Tools/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Pagalba"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Help/Apie"
 
-#: ../src/gtk/gftp-gtk.c:458
-msgid "Host: "
-msgstr "Kompiuteris:"
-
-#: ../src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Kompiuteris:"
 
-#: ../src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Prievadas:"
 
-#: ../src/gtk/gftp-gtk.c:507
-msgid "User: "
-msgstr "Naudotojas:"
-
-#: ../src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Naudotojas:"
 
-#: ../src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Slaptažodis:"
 
-#: ../src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komanda:"
 
-#: ../src/gtk/gftp-gtk.c:746 ../src/gtk/gftp-gtk.c:952
-#: ../src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Rinkmenos pavadinimas"
 
-#: ../src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Dydis"
 
-#: ../src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributai"
 
-#: ../src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progresas"
 
-#: ../src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: ../src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Įvesti naudotojo vardą"
 
-#: ../src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:119 ../src/gtk/transfer.c:555 ../src/gtk/transfer.c:565
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Sukurti aplanką"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:346 ../src/gtk/gtkui.c:358 ../src/gtk/misc-gtk.c:949
-#: ../src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: ../src/gtk/gtkui.c:356
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:378 ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Svetainė"
 
-#: ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:382
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:425 ../src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:450
-#: ../src/gtk/transfer.c:533 ../src/gtk/transfer.c:1012
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Praleista"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:512
-#: ../src/gtk/transfer.c:537
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: ../src/gtk/gtkui_transfer.c:124 ../src/gtk/gtkui_transfer.c:303
-#: ../src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Perrašyti"
 
-#: ../src/gtk/gtkui_transfer.c:131 ../src/gtk/gtkui_transfer.c:309
-#: ../src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Pratęsti"
 
-#: ../src/gtk/gtkui_transfer.c:138 ../src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Praleisti"
 
-#: ../src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Veiksmas"
 
-#: ../src/gtk/gtkui_transfer.c:224 ../src/gtk/gtkui_transfer.c:233
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Siųsti rinkmenas"
 
-#: ../src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr ""
 
-#: ../src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Klaida"
 
-#: ../src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Praleisti rinkmeną"
 
-#: ../src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Pasirinkti visus"
 
-#: ../src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:74 ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:105 ../src/gtk/menu-items.c:313
-#: ../src/gtk/menu-items.c:377 ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:341 ../src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Išsaugoti žurnalą"
 
-#: ../src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:468 ../src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Apie gFTP"
 
-#: ../src/gtk/menu-items.c:504
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Autorinės teisės (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Oficialus namų puslapis: http://www.gftp.org/\n";
 "Logo: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Apie"
 
-#: ../src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:571 ../src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr " Uždaryti "
-
-#: ../src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Sulyginti langus"
 
-#: ../src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Atsijungti iš nutolusio serverio"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Visos rinkmenos"
 
-#: ../src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Neprisijungta"
 
-#: ../src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Klaida atveriant rinkmeną %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:943 ../src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Keisti"
 
-#: ../src/gtk/misc-gtk.c:1014 ../src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Pridėti"
-
-#: ../src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: ../src/gtk/misc-gtk.c:1110
-msgid "  Yes  "
-msgstr " Taip "
-
-#: ../src/gtk/misc-gtk.c:1120
-msgid "  No  "
-msgstr " Ne "
-
-#: ../src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " Sustabdyti "
 
-#: ../src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2697,105 +2721,89 @@ msgstr ""
 "Gauta %ld aplankų\n"
 "ir %ld rinkmenų"
 
-#: ../src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, fuzzy, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP klaida: Nepavyko rasti rinkmenos %s  %s arba %s\n"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Keisti kompiuterį"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Pridėti kompiuterį"
 
-#: ../src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Tipas:"
-
-#: ../src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../src/gtk/options_dialog.c:1017 ../src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Sritis"
 
-#: ../src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr "Tinklo adresas"
-
-#: ../src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Tinklo adresas:"
 
-#: ../src/gtk/options_dialog.c:1091 ../src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr "Tinklo kaukė"
-
-#: ../src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Tinklo _kaukė"
 
-#: ../src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Sritis:"
 
-#: ../src/gtk/options_dialog.c:1250
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Tinklo kaukė"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Vietiniai kompiuteriai"
 
-#: ../src/gtk/options_dialog.c:1291 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Redaguoti"
-
-#: ../src/gtk/options_dialog.c:1293
-msgid "_Edit"
-msgstr "_Redaguoti"
-
-#: ../src/gtk/options_dialog.c:1370 ../src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Nustatymai"
 
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Gaunami rinkmenų pavadinimai..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:681
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Jungiamasi..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Gaunamos rinkmenos: neprisijungta prie nutolusios svetainės\n"
 
-#: ../src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Klaida: antrinis procesas %d grąžino %d\n"
 
-#: ../src/gtk/transfer.c:358
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:362
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:372
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Klaida: Nepavyko gauti informacijos apie rinkmeną %s: %s\n"
 
-#: ../src/gtk/transfer.c:377
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Rinkmena %s buvo nepakeista\n"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2804,116 +2812,180 @@ msgstr ""
 "Rinkmena %s pasikeitė.\n"
 "Ar norėtumėte ją įkelti?"
 
-#: ../src/gtk/transfer.c:388
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Redaguoti rinkmeną"
 
-#: ../src/gtk/transfer.c:453
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Baigta"
 
-#: ../src/gtk/transfer.c:493
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:727
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:731
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:761
-#, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr ""
-
-#: ../src/gtk/transfer.c:770
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:805
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:884 ../src/gtk/transfer.c:906
-#: ../src/gtk/transfer.c:940 ../src/gtk/transfer.c:980
-#: ../src/gtk/transfer.c:1033 ../src/gtk/transfer.c:1093
-msgid "There are no file transfers selected\n"
+#: src/gtk/transfer.c:804
+#, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:924
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: ../src/gtk/transfer.c:965 ../src/gtk/transfer.c:1018
-#, c-format
-msgid "Skipping file %s on host %s\n"
+#: 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 ""
 
-#: ../src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Rodyti"
 
-#: ../src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Redaguoti"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Rodyti: %s yra aplankas. Jo parodyti nepavyko.\n"
 
-#: ../src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: ../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 "Redaguoti: %s yra aplankas. Jo redaguoti nepavyko.\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 ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Paleidžiama programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:271
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Atveriama %s su %s\n"
 
-#: ../src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Rodoma rinkmena %s\n"
 
-#: ../src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Rodyti: Nepavyko atverti rinkmenos %s: %s\n"
 
-#: ../src/text/gftp-text.c:176
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nepavyko atverti kontroliuojančio terminalo %s\n"
 
-#: ../src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Naudotojo vardas [anonimas]:"
 
-#: ../src/text/textui.c:143
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Pradinis aplankas:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Pradinis gFTP atveriamas aplankas"
+
+#~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+#~ msgstr "Klaida konvertuojant užrašą %s į UTF-8 iš esamos lokalės: %s\n"
+
+#~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+#~ msgstr "Klaida konvertuojant užrašą %s iš UTF-8 į esamą lokalę:  %s\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr " Atšaukti"
+
+#~ msgid "Apply"
+#~ msgstr "Pritaikyti"
+
+#~ msgid "OpenURL"
+#~ msgstr "Atverti URL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Nustatymai..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Local/Sukurti aplanką..."
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Transfers/Pradėti siuntimą"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Transfers/Sustabdyti siuntimą"
+
+#~ msgid "Host: "
+#~ msgstr "Kompiuteris:"
+
+#~ msgid "User: "
+#~ msgstr "Naudotojas:"
+
+#~ msgid "  Close  "
+#~ msgstr " Uždaryti "
+
+#~ msgid "Add"
+#~ msgstr "Pridėti"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+
+#~ msgid "  Yes  "
+#~ msgstr " Taip "
+
+#~ msgid "  No  "
+#~ msgstr " Ne "
+
+#~ msgid "Type:"
+#~ msgstr "Tipas:"
+
+#~ msgid "Network Address"
+#~ msgstr "Tinklo adresas"
+
+#~ msgid "_Edit"
+#~ msgstr "_Redaguoti"
diff --git a/po/lv.po b/po/lv.po
index 5feb6c4..b7c5707 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,12 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-03-31 18:54+0300\n"
 "Last-Translator: Rūdofls Mazurs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <locale laka lv>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,89 +20,88 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Nederīgs URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Kļūda: nederīga rinda %s indeksa kešfailā\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Kļūda: nevarēja izveidot direktoriju %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Kļūda: nevar izveidot pagaidu failu: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Kļūda aizverot faila aprakstītāju: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Kļūda: nevar meklēt failā %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr ""
-"Kļūda pārveidojot virkni '%s' no rakstzīmju kopas %s uz rakstzīmju kopu %s: %"
-"s\n"
+"Kļūda pārveidojot virkni '%s' no rakstzīmju kopas %s uz rakstzīmju kopu %s: "
+"%s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Kļūda: nevar atvērt lokāles failu %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Kļūda: nevarēja ierakstīt ligzdā: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Kļūda: nevarēja nolasīt no ligzdas: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP kļūda: slikts grāmatzīmes faila nosaukums %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Brīdinājums: nevar atrast galveno grāmatzīmes failu %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP kļūda: nevar atvērt grāmatzīmju failu %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP brīdinājums: izlaiž %d. rindiņu grāmatzīmju failā: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP brīdinājums: rindā %d nav pietiekami daudz argumetnu\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -112,7 +111,7 @@ msgstr ""
 "vajadzības izmantot starpniekserveri (ja pieejams). Sintakse: "
 "dont_use_proxy=.domain vai dont_use_proxy=tīkla numurs/tīkla maska"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -121,56 +120,52 @@ msgstr ""
 "programma. Piezīme: neviens arguments izņemot faila paplašinājumu nav "
 "obligāts"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP kļūda: slikts konfigurācijas faila nosaukums %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP kļūda: nevarēja izveidot direktoriju %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP kļūda: nevar atrast konfigurācijas failu %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Vai jūs izpildījāt instalāciju?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP kļūda: nevar atvērt konfigurācijas failu %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Pārtrauc darbību parsēšanas kļūdu dēļ konfigurācijas faila rindā %d\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP brīdinājums: izlaiž rindu %d konfigurācijas failā: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP kļūda: slikts žurnāla faila nosaukums %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP brīdinājums: nevar atvērt %s rakstīšanai: %s\n"
 
-#: ../lib/config_file.c:732
-#| msgid ""
-#| "Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney "
-#| "<masneyb gftp org>. Warning: Any comments that you add to this file WILL "
-#| "be overwritten"
+#: 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"
@@ -179,7 +174,7 @@ msgstr ""
 "<masneyb gftp org>. Brīdinājums: ikviens komentārs, ko esat pievienojis šim "
 "failam TIKS pārrakstīts."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -191,12 +186,7 @@ msgstr ""
 "kas stāv jums aiz muguras, kamēr jūs rediģējat šo failu. Saskaņā ar "
 "iepriekšējo, šim visas paroles tika noglabātas vienkāršā tekstā."
 
-#: ../lib/config_file.c:845
-#| msgid ""
-#| "Config file for gFTP. Copyright (C) 1998-2003 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"
+#: 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. "
@@ -207,96 +197,95 @@ msgstr ""
 "failam TIKS pārrakstīts. Ja ierakstam ir (*) tā komentārā, jūs to nevarat "
 "mainīt iekš gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nezināms>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "FATĀLA gFTP kļūda: konfigurācijas iespēja '%s' nav atrasta vispārējā "
 "jaucējtabulā\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Kļūda: nevar lejupielādēt failu %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Kļūda: neavr rakstīt failā %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Kļūda: kļūda aizverot failu: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Bojāts failu saraksts no FSP servera %s\n"
 
-#: ../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
+#: 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 "nezināms"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nevarēja iegūt FSP direktoriju sarakstu %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Veiksmīgi mainīta direktorija uz %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nevarēja mainīt direktoriju uz %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Veiksmīgi noņemts %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Kļūda: nevarēja noņemt direktoriju %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Kļūda: nevarēja noņemts failu %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Veiksmīgi izveidota direktorija %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Veiksmīgi pārsaukts %s uz %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Kļūda: nevarēja pārsaukt %s uz %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -304,7 +293,7 @@ msgstr ""
 "FTPS atbalsts nav pieejams kopš SSL atbalsts netika kompilēts. Pārtrauc "
 "savieojumu.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -312,109 +301,105 @@ msgstr ""
 "HTTPS atbalsts nav pieejams kopš SSL atbalsts netika kompilēts, Pārtrauc "
 "savienojumu.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nevarēja iegūt esošo darba direktoriju: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Veiksmīgi izmainīta lokāles direktorija uz %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Nevarēja mainīt lokāles direktoriju uz %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Kļūda: nevar nogriezt lokāles failu %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nevarēja iegūt lokāles direktoriju sarakstu %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Veiksmīgi izmainīts režīms %s uz %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Kļūda: nevarēja mainīt režīmu %s uz %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
-#| msgid "Successfully changed directory to %s\n"
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Veiksmīgi mainīts %s laika spiedogs\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
-#| msgid "Error: Could not change mode of %s to %o: %s\n"
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Kļūda: nevarēja mainīt %s laika spiedogu: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokālā failu sistēma"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "lietojums: gftp"
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nekas"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fails"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "izmērs"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "lietotājs"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "šķirot"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datums laiks"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atrib"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "dilstoši"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "augoši"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Vispārīgi"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Skatīt programmu:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -422,27 +407,27 @@ msgstr ""
 "Noklusētā programma, izmantota failu apskatei. Ja šis ir tukšs, tiks "
 "izmantots iekšējais failu skatītājs"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Rediģēt programmu:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Noklusētā programma, ko lietot rediģējot failus."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maksimālais reģistra loga izmērs:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maksimālais reģistra loga izmērs baitos GTK+ portam"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Attālināti rakstzīmju komplekti:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -450,11 +435,11 @@ msgstr ""
 "Šis ir ar komatu atdalīts rakstzīmju kopu saraksts, lai mēģinātu pārveidot "
 "attālinātos ziņojumus uz esošo lokāli"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Attālināts LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -462,194 +447,196 @@ msgstr ""
 "Šī ir LC_TIME attālinātās vietas vērtība. Tā, ka datumi var tikt parsēti "
 "atbilstoši direktoriju sarakstos."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Keša TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Sekunžu skaits, ko paturēt keša ierakstos pirms tās dziest."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Pievienot faila pārraides"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Pievienot jaunas failu pārraides uz esošajām"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Veikt vienu pārraidi laika posmā"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Veikt tikai vienu pārraidi laika posmā?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Pārrakstīt pēc noklusējuma"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Pārrakstīt failus pēc noklusējuma vai uzstādīt uz kopsavilkumu failu "
 "pārraides"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Saglabāt faila atļaujas"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Saglabāt faila atļaujas pārraidītajiem failiem"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Saglabāt faila laiku"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Saglabāt failu pārraides laikus failiem"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Atsvaidzināt pēc katra faila pārraides"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Atsvaidzināt sarakstu lodziņus pēc katra faila pārraides"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Kārtot direktorijas pirmās"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Likt direktorijas pirmās, pēc tam failus"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Rādīt slēptos failus"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Rādīt slēptos failus sarakstu lodziņos"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Rādīt pārraides stāvokli virsrakstā"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Rādīt failu pārraides stāvokli virsraksta joslā"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Sākt failu pārraides"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Automātiski sākt failu pārraides, kad tās tiek aptaujātas"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Atļaut pašrocīgas komandas iekš GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Atļaut pašrocīgi ievadīt komandas iekš GUI (funkcijas, līdzīgas teksta "
 "portam)"
 
-#: ../lib/options.h:111
-#| msgid "Remove a local directory"
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Atcerēties pēdējo mapi"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Saglabāt pēdējo lokālo un attālināto mapi, kad tiek aizvērta lietotne"
 
-#: ../lib/options.h:115
-#| msgid "Disconnect from the remote server"
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Palaižoties savienoties ar serveri"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Automātiski savienoties ar attālinātu serveri, kad tiek palaista lietotne."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Tīkls"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Tīkla starplaiks:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Starplaika gaidīšana tīkla ievadei/izvadei. Šis nav dīkstāves starplaiks."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Savienojuma atkārtojumi:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Automātisko auto-atkārtojumu skaits, ko veikt. Uzstādiet šo uz 0, lai "
 "atkārtotu nenoteikti"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Atkārtošanas miega laiks:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Sekunžu skaits, ko gaidīt starp atkārtotšanas mēģinājumiem"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maksimāli KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Failu pārraide var maksimāli sasniegt KB/s. (Uzstādiet uz 0, lai izslēgtu)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Pārraides bloku izmērs:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Bloku izmers, kas tiek lietots, kad pārraida failus. Šim vajadzētu būt "
 "palielinatam līdz 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Noklusētais protokols:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Šis norāda, kādu noklusēto protokolu lietot"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Aktivizēt IPv6 atbalstu"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -657,27 +644,27 @@ msgstr ""
 "Šis apzīmē, kas notiks, kad jūs divreiz uzklikšķināsiet uz faila failu "
 "sarakstu lodziņos. 0=Skatīt failu, 1=Rediģēt failu, 2=Pārraidīt failu"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Noklusētais lokālo failu sarakstu lodziņu platums"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Noklusētais attālināto failu sarakstu lodziņu platums"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Noklusētais lokālo/attālināto failu sarakstu lodziņu augstums"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Noklusētais pārraides loga augstums"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Noklusētais pieslēgšanās loga augstums"
 
-#: ../lib/options.h:177
+#: 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."
@@ -685,15 +672,15 @@ msgstr ""
 "Faila nosaukuma platums pārraides logā. Uzstādiet šo uz 0, lai kolonna "
 "automātiski mainītu izmērus."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Noklusētā kolonna, ko šķirot pēc "
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Šķirot augošā vai dilstošā secībā"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -702,7 +689,7 @@ msgstr ""
 "kolonna automātiksi mainītu izmērus. Uzstādiet šo uz -1, lai izslēgtu šo "
 "kolonnu"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -711,7 +698,7 @@ msgstr ""
 "kolonna automātiksi mainītu izmērus. Uzstādiet šo uz -1, lai izslēgtu šo "
 "kolonnu"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -720,7 +707,7 @@ msgstr ""
 "kolonna automātiksi mainītu izmērus. Uzstādiet šo uz -1, lai izslēgtu šo "
 "kolonnu"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -728,7 +715,7 @@ msgstr ""
 "Grupas kolonnas platums faila sarakstu lodziņos. Uzstādiet šo uz 0, lai "
 "koloona automātiski mainītu izmērus. Uzstādiet šo uz -1, lai izslēgtu kolonnu"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -736,7 +723,7 @@ msgstr ""
 "Datuma kolonnas platums faila sarakstu lodziņos. Uzstādiet šo uz 0, lai "
 "kolonna automātiski mainītu izmēru. Uzstādiet šo uz -1, lai izslēgtu kolonnu"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -745,75 +732,75 @@ msgstr ""
 "kolonnas automātiski mainītu izmērus. Uzstādiet šo uz -1, lai izslēgtu šo "
 "kolonnu"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Servera sūtīto ziņojumu krāsa"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Saņemto serveru komandu krāsa"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Kļūdu ziņojumu krāsa"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Pārējo žurnalējošo attēlu krāsa"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokāls"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Grāmatzīme"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Faila pārraide tiks samazināta uz %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Kļūda uzstādot LC_TIME uz '%s'. Atgriežas atpakaļ uz '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Ielādē direktoriju sarakstu %s no keša (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Ielādē direktoriju sarakstu %s no servera (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -822,112 +809,112 @@ msgstr ""
 "Brīdinājums:  svītro ceļu no faila '%s'. Svītrotais ceļš (%s) neatbilst "
 "esošajai direkltorijai (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Kļūda: nevar ierakstīt kešā: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Kļūda: nevar atrast grāmatzīmi %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 "Grāmatzīmes kļūda: grāmatzīmes ierakstam %s nav saimniekdatora nosaukums\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokols '%s' pašreiz netiek atbalstīts.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Atrasta rekursīva simboliskā saite %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Kļūda: attālinātā lapa %s atvienojusies.  Maksimālais daudzums mēģinājumu "
 "pievienoties sasniegts...padodos\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Kļūda: attālinātā lapa %s atvienota. Atkārtoti savienosies %d sekundēs\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Kļūda: nevar uzstādīt blakus izpildāmajam karodziņam: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nevar atvērt saimnieka pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nevar izveidot ligzdu pāri: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Kļūda: nevar izpildīt ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nevar sazarot citu procesu: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Starpnieka resursdatora nosaukums:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Ugunsmūra saimniekdatora vārds"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Starpnieka ports:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Ports, lai pievieslēgtos uz ugunsmūra "
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Starpnieka lietotājvārds:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Jūsu ugunsmūra lietotājvārds"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Starpnieka parole:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Jūsu ugunsmūra parole"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Lietot HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vai vēlaties lietot HTTP/1.1 vai HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -936,65 +923,65 @@ msgstr ""
 "Saņemta nepareiza atbilde no servera, atvienojas\n"
 "Nepareizs fragmenta izmērs '%s', ko atgriezis attālinātais serveris\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Atvienojas no lapa %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Sāk failu pārraidi pie nobīdes"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nevar atgūt failu %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Atjauno direktoriju sarakstu...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Saņemta nepareiza atbilde no servera, atvienojas\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "VIETAS komanda"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "lietotājs saimniekdators"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "lietotājs saimniekdators: ports"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTIFICĒTIES"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "lietotājs saimniekdators ports"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "lietotājs saimniekdators NAVAUT"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Starpnieks"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Pielāgot"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-pasta adrese:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1002,19 +989,19 @@ msgstr ""
 "Šī ir parole, kas tiks izmantota ikreiz, kad jūs ienāksiet attālinātajā FTP "
 "serverī anonīmi"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Starpnieka konts:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Jūsu ugunsmūra konts (pēc izvēles)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Starpniekservera tips:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1031,11 +1018,11 @@ msgstr ""
 "(ceļš), h (dators), o (ports) vai a (konts). Piemēram, lai norādītu "
 "starpnieka lietotāju, jūs varat ierakstīt %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorēt PAROLES adresi"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1047,11 +1034,11 @@ msgstr ""
 "ir nepieciešams rūteriem, sniedzot to iekšēji, nekā ārēji IP PAROLES "
 "atbildei."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasīvas failu pārraides"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1066,11 +1053,11 @@ msgstr ""
 "vecāku FTP serveri, kas neatbalsto šo. Ja šis ir ieslēgts, tad dFTP atvērs "
 "portu klienta pusē un attālinātais serveris mēģinās tam pievienoties."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Atrisināt attālinātās simsaites (LIST-L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1081,15 +1068,16 @@ msgstr ""
 "Vispārīgi, ir laba doma šo atstāt ieslēgtu. Vienīgā reize, kad jūs "
 "vēlēsieties to atslēgt būs, ja FTP serveris neatbalstīs -L iespēju SARKASTĀ"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Pārraida failus ASCII režīmā"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1098,334 +1086,325 @@ msgstr ""
 "failiem. Ja jūs pārraidat no UNIX uz UNIX, tad ir droši šo atstāt izslēgtu. "
 "Ja jūs lejupielādējat binārus datus, jūs vēlēsieties šo izslēgt."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Nederīga atbilde '%c' saņemts no servera.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Neizdevās izveidot IPv4 ligzdu: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Nevar atrast IP adresi PASV atbildē '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Ignorē IP adresi PASV atbildē, savieno ar %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Nevar izveidot datu savienojumu: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Nevarēja iegūt ligzdas nosaukumu: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Nevar saistīt portu: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Nevarēja klausīties portu %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Neizdevās izveidot IPv6 ligzdu: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Kļūda: neizskatās, ka mēs būtu savienoti caur IPv6. Savienojuma "
 "pārtraukšana.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Nederīga EPSV atbilde '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Nevar iegūt adresi no vietējās ligzdas: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nevar pieņemt savienojumu no servera: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "kopā"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Brīdinājums: nevar parsēt sarakstu %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Meklē %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Nevar atrast saimniekdatora nosaukumu %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Neizdevās izveidot ligzdu: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Mēģina %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Neizdevās pievienot uz %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Pievienots %s: %d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Nevar atrast servisa nosaukumu %s/tcp. Lūdzu pārbaudiet savu servisu failu\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Pievienošanās %s pārtraukta\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Nevar iegūt ligzdas karodziņus: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Nevar uzstādīt ligzdu uz nebloķējošu: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH programmas nosaukums:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Pieeja uz SSH izpildāma"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH papildus parametri:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Papildus parametri, lai ienāktu SSH programmā"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Nepieciešams SSH lietotājs/pieeja"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Pieprasa lietotājvārdu/paroli SSH savienojumiem"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Izpildās programma %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Ievadiet pieejas frāzi RSA atslēgai"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Ievadiet pieejas frāzi atslēgai '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Parole"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "parole"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(jā/nē)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Ievadiet PIEEJAS KODU:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Ievadīt DrošID paroli:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Kļūda: tika ievadīta nepareiza parole\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: protokols inicializācija\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: protokola versija %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: atvērt %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: aizvērt\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: atvērt direktoriju %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: nolasīt direktoriju\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: noņemt failu %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: izveidot direktoriju %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d:noņemt direktoriju %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: reālceļš %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Faila atribūti\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d Srež %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Ulaiks %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Labi"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "Faila beigas(EOF)"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Nav tāda faila vai direktorijas"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Defekts"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Slikts ziņojums"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nav savienojuma"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Pieslēgums zudis"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Neatbalstīta operācija"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Nezināms ziņojums atgriezās no servera"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Kļūda: ziņojuma izmērs %d par lielu\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Kļūda: ziņojuma izmērs %d par lielu no servera\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1433,41 +1412,41 @@ msgstr ""
 "Notika kļūda inicializējot SSH savienojumu ar attālināto serveri. Seko šis "
 "kļūdas ziņojums no attālinātā servera:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Atver SSH savienojumu uz %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Veiksmīgi ieiets SSH serverī %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL vadība"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL entropijas fails:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropijas fails"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropija stāda garums:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Maksimālais baitu skaits ar ko iestādīt SSL vadību"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Pārbaudīt SSL vienaudzi"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1480,11 +1459,11 @@ msgstr ""
 "Temats = %s\n"
 "Kļūda %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Nevar iegūt vienādranga sertifikātu\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1493,45 +1472,45 @@ msgstr ""
 "KĻŪDA: Saimniekdators SSL sertifikātā (%s) neatbilst saimniekdatoram, ko "
 "esam pievienojuši (%s). Pārtrauc savienojumu.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Nevar inicializēt atvērto SSL bibliotēku\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Kļūda ielādējot noklusētos SSL sertifikātus\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Kļūda veidojot šifra sarakstu (nav derīgu šifru)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Kļūda: SSL vadība netika inicializēta\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Kļūda uzstādot SSL savienojumu (BIO objekts)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Kļūda uzstādot SSL savienojumu (SSL objekts)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Kļūa ar vienādranga sertifikātu: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operācija atsaukta\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Gaida %d sekundes līdz atkārtotam savienošanās mēģinājumam\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1541,73 +1520,73 @@ msgstr ""
 "failu. Šī ir brīva programmatūra, esat laipni aicinātu to izplatīt zem "
 "noteiktiem nosacījumiem; detalizētākai informācijai, skatiet PAVADOŠO failu\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "TulkojušiLestrange tvnet lv"
 
-#: ../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
+#: 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 "Kļūda: nav savienots ar attālināto vietu\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "lietojums: chmod <režīms> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "lietojums: pārsaukt <vecais nosaukums> <jaunais nosaukums>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "lietojums: dzēst<failu>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "lietojums: pvdir <direktorija>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "lietojums: vieta <vietas komanda>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "lietojums: izvdir <jauna direktorija>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "lietojums: bdir <direktorija>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Nederīgs arguments\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Iztīrīt direktorijas kešu\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "lietojums: atvērt "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "lietojums: uzstādīt [mainīgais = vērtība]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr " Kļūda: mainīgais %s nav derīgs konfigurācijas mainīgais.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr " Kļūda: mainīgais %s nav pieejams teksta portā no gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1615,327 +1594,325 @@ msgstr ""
 "Atbalstītās komandas:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "lietojums: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "par"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Rāda gFTP informāciju"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Uzstāda esošo failu pārraides režīmu uz Ascii (tiaki priekš FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binārs"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Uzstāda esošo failu pārraides režīmu uz Bināru (tikai priekš FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Izmaina attālināto darba direktoriju"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Izmaina attālinātā faila atļaujas"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "tīrs"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Pieejamās iespējas: kešs"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "aizvērt"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Atvienojas no attālinātās vietas"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "dzēst"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Noņem attālināto failu"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Parāda direktorijas sarakstu esošajai attālinātajai direktorijai"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "iegūt"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Lejupielādē attālināto failu(s)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "palīdzība"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Parāda šo palīdzības ekrānu"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Izmaina lokāles darba direktoriju"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Izmaina atļaujas lokāles failam"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Noņem lokāles failu"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Parāda direktorijas sarakstu pašreizējai lokāles direktorijai"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Izveido lokāles direktoriju"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Parādīt pašreizējo lokāles direktoriju"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Pārsaukt lokāles failu"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Noņem lokāles direktoriju"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "izvdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Izveido attālinātu direktoriju"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Augšupielādē lokāles failu(s)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "atvērt"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Atver savienojumu uz attālināto vietu"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "ievietot"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "par"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Parādīt pašreizējo attālināto direktoriju"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "beigt"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Iziet no gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "pārsaukt"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Pārsaukt attālināto failu"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Noņemt attālināto direktoriju"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "iestatīt"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Parādīt konfigurācijas faila mainīgos. Jūs varat arī uzstādīt mainīgos, "
 "uzstādot mainīgais=vērtība  "
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "vieta"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Palaist vietas specifisku komandu"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Kļūda: komanda nav atpazīta\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Veiksmīgi pārraidīts %s pie at %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Izlaiž failu%s uz saimniekdatora %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Aptur pārraidi uz saimniekdatora %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nevarēja lejupielādēt %s no %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 "%d failus vai mapes nevarēja pārsūtīt. Pārbaudiet žurnālu, lai redzētu, "
-"kurus "
-"failus nevarēja pārsūtīt."
+"kurus failus nevarēja pārsūtīt."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: lūdzu nospiediet \"Stop\" pogu, pirms dariet ko citu\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Palaist grāmatzīmi"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Pievienot grāmatzīmi: jums jāievada gramatzīmes nosaukums\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Pievienot grāmatzīmi: nevar pievienot grāmatzīmi %s, jo tāds nosaukums jau "
 "eksistē\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Pievienot grāmatzīmi"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Pievienot grāmatzīmi: Jums jāievada resursdatora nosaukums\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1945,32 +1922,31 @@ msgstr ""
 "Jūs varat atdalīt vienības pēc / ievietojot tās apakšizvēlnē\n"
 "(piem.,Linux vietas/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Atcerēties paroli"
 
-#: ../src/gtk/bookmarks.c:420
-#| msgid "Add Bookmark: You must enter a name for the bookmark\n"
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Jums jānorāda grāmatzīmes nosaukums."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Jauna mape"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Ievadiet jaunas mapes nosaukumu, ko izveidot"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Jauna vienība"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Ievadiet jaunas vienības nosaukumu, ko izveidot"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1979,106 +1955,99 @@ msgstr ""
 "Vai esat pārliecināts, ka vēlaties dzest grāmatzīmi\n"
 "%s un visus tās bērnus?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Dzēst grāmatzīmi"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Grāmatzīmes"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Rediģēt ierakstu"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Resursdatora nosaukums:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Ports:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokols:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Attālināta direktorija:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokāles direktorija:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Lietotājvārds:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konts:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Ienākt ANONĪMI"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Atsaukt "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fails/pārceļams"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fails/Jau_na mape..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fails/Jauna v_ienība..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fails/_Dzēst"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fails/Ī_pašības..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fails/atd"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fails/_Aizvērt"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Rediģēt grāmatzīmes"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2086,92 +2055,91 @@ msgstr ""
 "Jūs tagad varat pielāgot jūsu faila(u) atribūtus\n"
 "Piezīme: Ne visi ftp serveri atbalsta chmod īpašību"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciāls"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Lipīgs"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Lietotājs"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lasīt"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Rakstīt"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Izpildīt"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Cits"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Vai esat pārliecināts, ka vēlaties dzēst šos %ld failus un %ld direktorijas"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Vai esat pārliecināts, ka vēlaties dzēst šos %ld failus"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Vai esat pārliecināts, ka vēlaties dzēst šīs %ld direktorijas"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Dzēst failus/direktorijas"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Dzēst"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Savienot"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Saņemts URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Vilkt-un-mest"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Iziet"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2179,468 +2147,455 @@ msgstr ""
 "Notiek failu pārraide.\n"
 "Vai esat pārliecināts, ka vēlaties iziet?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Atvērt vietu"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Ievadiet URL, lai savienotu ar"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Logs _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Logs _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/atd"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binārs"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Izvēles..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Iziet"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokāle"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokālais/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokālais/Atvērt vietu..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokālais/_Atvienot"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokālais/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokālais/Mainīt _faila spec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokālais/_Parādīt izvēlēto"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokālais/Izvēlēties _visus"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokālais/Izvēlēties visus failus"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokālais/Noņemt visu"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokālais/Saglabāt direktorijas sarakstu..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokālais/Sūtīt VIETAS komandu..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokāls/_Mainīt direktoriju"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokālais/_Atļaujas..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Lokālais/_Jauna mape..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokālais/Pār_saukt..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokālais/_Dzēst..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokāls/_Rediģēt..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokālais/_Skats..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokālais/_Atsvaidzināt"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Attālināts"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Attālināts/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Lokālais/_Atvērt vietu..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Attālināts/_Atvienot"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Attālināts/atd"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Attālināts/Mainīt _faila spec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Attālināts/_Parādīt izvēlēto"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Attālināts/Izvēlēties _visu"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Attālināts/Izvēlēties visus failus"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Attālināts/Noņemt visu"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Attālināts/Saglabāt direktorija sarakstu..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Attālināts/Sūtīt VIETAS komandu..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Attālināts/_Mainīt direktoriju"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Attālināts/_Atļaujas..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Attālināts/_Jauna mape..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Attālināts/Pār_saukt..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Attālināts/_Dzēst..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Attālināts/_Rediģēt..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Attālināts/_Skats..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Attālināts/_Atsvaidzināt"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Grāmatzīmes"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Grāmatzīmes/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Grāmatzīmes/Pievienot _grāmatzīmi"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Grāmatzīmes/Rediģēt grāmatzīmes"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Grāmatzīmes/atd"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Pārraide"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Pārraide/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Pārraide/_Sākt"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Pārraide/Apt_urēt"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Pārraide/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Pārraide/Izlaist pašreizējo failu"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Pārraide/Noņem_t faiu"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Pārraide/Pārvietot failu a_ugšup"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Pārraide/Pārvietot failu le_jup"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Pārraide/At_gūt failus"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Pārraide/_Ievietot failus"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Reģistrs/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Reģistrs/_iztīrīt"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Reģistrs/_skats"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Reģistrs/_saglabāt..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Rīk_i"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Rīki/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Rīki/S_alīdzināt logus"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Rīki/_ iztīrīt kešu"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Palīdzība"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Palīdzība/pārceļams"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Palīdzība/_ Par"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Resursdators: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Resursdators: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Ports: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Lietotājs: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Lietotājs: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Parole: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komanda: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Faila nosaukums"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Izmērs"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datums"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atrib"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Kļūda: jums jāievada iekš saimniekdatora, lai savienotos ar\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Atsvaidzināt"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Ievadiet lietotājvārdu"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Lūdzu ievadiet savu lietotājvārdu šai vietai"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Lūdzu ievadiet jūsu paroli šai vietai"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operācija atsaukta...jums jāievada virkne\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Izvdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Izveidot direktoriju"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Ievadiet direktorijas nosaukumu, ko vēlaties izveidot"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Kā jūs vēlētos pārsaukt %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Vieta"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Ievadiet vietas specifisku komandu"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Sagaidīt ar VIETNI"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Izlaists"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Gaidīšana..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Atsākt"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Izlaist"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Darbība"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Pārraidīt failus"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2648,59 +2603,59 @@ msgstr ""
 "Sekojošs fails(i) eksistē uz abiem, vietējā un attālinātā datora\n"
 "Lūdzu izvēlieties vēlamo darbību        "
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Kļūda"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Izlaist failu"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Izvēlēties visu"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Noņemt visu"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Mainīt failaīpatn: operācija atsaukta...jums jāievada virkne\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Mainīt failaīpatn"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Ievadiet jaunā faila īpatnības"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Kļūda: nevar atvērt %s rakstīšanai: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Saglabāt direktorijas sarakstu"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Kļūda: kļūda rakstot uz %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Veiksmīgi ierakstītja žurnāla failu uz %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Saglabāt žurnālu"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2709,17 +2664,12 @@ msgstr ""
 "Nevar atrast licences līgumu faila KOPĒŠANAI. Lūdzu pārliecinieties, ka tas "
 "atrodas %s vai %s "
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Par gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
-#| msgid ""
-#| "%s\n"
-#| "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
-#| "Official Homepage: http://www.gftp.org/\n";
-#| "Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgid ""
 "%s\n"
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
@@ -2729,27 +2679,23 @@ msgstr ""
 "Autortiesības (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Oficiālā mājaslapa:  http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Par"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licences vienošanās"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Aizvērt "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Salīdzināt logus"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Atvienošanās no attālinatā servera"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2758,72 +2704,56 @@ msgstr ""
 "saimniekdatora ierkast ir tukšs, tad paradās dialogs, kas ļaus jums ievadīt "
 "URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Visi faili"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Kešots) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nav savienojuma"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Kļūda atverot failu %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: nav savienots ar attālināto lapu\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: šī īpašība nav pieejama, lietotjot šo protokolu\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: jums jābūt izvēlētai tikai vienai lietai\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: jums jāizvēlas vismaz viena lieta\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Mainīt"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Pievienot"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Atsaukt"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "   Jā "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nē "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Iegūst direktoriju sarakstus"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Apturēt "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2832,109 +2762,89 @@ msgstr ""
 "Saņemtas %ld direktorijas\n"
 "un %ld faili"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP kļūda: nevar atrast failu %s iekš %s vai %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Rediģēt saimniekdatoru"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Pievienot saimniekdatoru"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tips:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tips:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domēns"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Tīkla adrese"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Tīkla adrese:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Tīkla maska"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "T_īkla maska:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domēns:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Tīkla maska"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokālie saimniekdatori"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Rediģēt"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Rediģēt"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Iespējas"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Pielietot"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Saņem failu nosaukumus..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Savienojas..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Atgūt failus: nav savienots ar attālināto mājas lapu\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Kļūda: bērns %d atgrieza %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Bērns %d atgrizās veiiksmīgi\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Kļūda: bērns %d netika pārtraukts atbilstoši\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Kļūda: nevar iegūt informāciju par failu %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Fails %s nav ticis izmainīts\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2943,118 +2853,157 @@ msgstr ""
 "Fails %s ticis izmainīts.\n"
 "Vai jūs vēlaties to lejupielādēt?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Rediģēt failu"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Pabeigts"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Nosūtīts %s no %s pie %.2fKB/s, %02d:%02d:%02d atl. laiks atlicis"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Saņ %s no %s pie %.2fKB/s, %02d:%02d:%02d atl. laiks atlicis"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Nosūtīts %s no %s, atlicis nezināms laika daudzums"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Saņ %s no %s, pārraide novietota, atlicis nezināms laika daudzums"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Nezināms procentos paveikts. (Fails %ld no %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% pabeigts, %02d:%02d:%02d atl. laiks palicis. (Fails %ld no %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Atgūst failu nosaukumus...%s baiti"
 
-#: ../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
+#: 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 "Nav izvēlēta neviena faila pārraide\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Skats"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Rediģēt"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Skats: %s ir direktorija. To nevar skatīt.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Rediģēt: %s ir direktorija. To nevar rediģēt.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Rediģēt: jums jānorāda redaktors iespēju dialogā\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Skats: Nevar sazarot procesu: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Izpildās  programma: %s%s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Atvēršana %s ar %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Apskata failu %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Skats: nevar atvērt failu %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nevar atvērt kontroles termināli %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Lietotājvārds [anonīmi]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s jau eksistē. (%s avota izmērs, %s mērķa izmērs):\n"
 " (o)pārrakstīt, (r)atjaunot, (s)izlaist, (O)pārrakstīt visu, (R)atjaunot "
 "visu, (S)Izlaist visu: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Atsaukt "
+
+#~ msgid "Host: "
+#~ msgstr "Resursdators: "
+
+#~ msgid "User: "
+#~ msgstr "Lietotājs: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Aizvērt "
+
+#~ msgid "Add"
+#~ msgstr "Pievienot"
+
+#~ msgid "Cancel"
+#~ msgstr "Atsaukt"
+
+#~ msgid "  Yes  "
+#~ msgstr "   Jā "
+
+#~ msgid "  No  "
+#~ msgstr "  Nē "
+
+#~ msgid "Type:"
+#~ msgstr "Tips:"
+
+#~ msgid "Network Address"
+#~ msgstr "Tīkla adrese"
+
+#~ msgid "_Edit"
+#~ msgstr "_Rediģēt"
+
+#~ msgid "Apply"
+#~ msgstr "Pielietot"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
diff --git a/po/mk.po b/po/mk.po
index 245956e..ee5a8e9 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,93 +11,102 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.mk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-06-09 13:26+0200\n"
 "Last-Translator: Jovan Naumovski <jovan lugola net>\n"
 "Language-Team: Macedonian <ossm-members hedona on net mk>\n"
+"Language: mk\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"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Невалиден URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Грешка во претворањето на низата '%s\" од карактерите %s во карактери %s: "
+"%s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:488
 #, 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:441
 #, 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
-msgstr "Предупредување: Не може да се најде главната датотеката за обележувачи %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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
-"gFTP Предупредување: Се прескокнува линијата %d во датотека со обележувачи: %"
-"s\n"
+"gFTP Предупредување: Се прескокнува линијата %d во датотека со обележувачи: "
+"%s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 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 "
@@ -107,7 +116,7 @@ msgstr ""
 "да се излезе од прокси серверот (ако е достапен). Синтакса: 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"
@@ -116,56 +125,56 @@ 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 "Дали направивте make install?\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"
@@ -174,7 +183,7 @@ msgstr ""
 "<masneyb gftp 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 "
@@ -186,7 +195,7 @@ 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. "
@@ -197,94 +206,95 @@ msgstr ""
 "оваа датотека ќе бидат препишани. Ако записот има (*) во рамките на "
 "коментарот, тогаш не можете да го менувате во 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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 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' не е пронајдена во "
 "глобалната hash табела\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Грешка: Не можам да ја испратам датотеката %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Грешка: Не може да се запишува во датотеката %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Грешка: Грешка во затворање на датотека: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 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 "непознато"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Не може да се добие листање на FSP директориумот %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Успешно е сменет локалниот директориум во %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 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:304
 #, 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:308
 #, 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"
@@ -292,7 +302,7 @@ msgstr ""
 "FTPS подршката не е достапна бидејќи оваа верзија не компајлирана со SSL "
 "поддршка. Поврзувањето се прекинува.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -300,112 +310,105 @@ msgstr ""
 "HTTPS Подршката не е достапна бидејќи оваа верзија не е компајлирана со SSL "
 "поддршка. Поврзувањето се прекинува.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Не може да се добие работниот директориум: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Успешно е сменет локалниот директориум во %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 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 "Грешка: Не можев да го променам режимот од %s во %o: %s\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 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 "Грешка: Не можев да ја променам временската ознака на %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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ништо"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "датотека"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "големина"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "корисник"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "група"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "датум и време"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "атрибути"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "опаѓачки"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "растечки"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Општо"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Програма за преглед:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -413,27 +416,28 @@ msgstr ""
 "Преддефинираната програма која се користи за преглед на датотеки. Ако ова е "
 "празно, тогаш се користи интерниот прегледувач на датотеки"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Програма за уредување:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Преддефинирана програма за уредување на датотеки."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Максимална големина на прозорецот за логирање:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
-msgstr "Максималната големина на прозорецот за логирање во бајти за GTK+ портот"
+msgstr ""
+"Максималната големина на прозорецот за логирање во бајти за GTK+ портот"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Подесување на одалечен знак:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -441,11 +445,11 @@ msgstr ""
 "Ова е листа на знаци одделени со запирки за пробување да се префрлат "
 "одалечените пораки во тековното локале"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Одалечено LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -453,190 +457,202 @@ msgstr ""
 "Ова е вредноста за LC_TIME за одалечениот сајт. Ова е затоа да може датите "
 "правилно да се расчленуваат во списокот на директориумот."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Кеш на TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
-msgstr "Број на секунди за зачувување на внесовите во кешот пред тие да истечат."
+msgstr ""
+"Број на секунди за зачувување на внесовите во кешот пред тие да истечат."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Припои ги трансферите на датотеки"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Припои ги новите трансфери на датотеки кон постоечките"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Извршувај по еден трансфер истовремено"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Дали да се извршува само еден трансфер истовремено?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Автоматски препиши"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "Автоматски препиши ги датотеките или продолжи го трансферот на датотеките"
+msgstr ""
+"Автоматски препиши ги датотеките или продолжи го трансферот на датотеките"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Зачувај ги дозволите за датотеката"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Зачувај ги дозволите за трансферираните датотеки"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Зачувај го времето на датотеката"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Зачувај ги времињата на трансферираните датотеки"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Освежи после секој трансфер на датотека"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Освежи ја листата на датотеки после секој трансфер"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Подреди ги директориумите прво"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Прво стави ги директориумите потоа датотеките"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Прикажи ги скриените датотеки"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Прикажи ги скриените датотеки во листите"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Прикажи го статусот на трансферот во насловот"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Прикажи го статусот на трансферот во насловната лента"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Почни со трансфер на датотеки"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Автоматски го отпочнува трансферот на датотеки кога се стават во листата на "
 "задачи"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Дозволи рачни команди во GUI-то"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Дозволи внесување на рачни команди во GUI-то (функции како што е текстуално "
 "портирање)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Зачувај го последниот директориум"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr "Зачувај го последниот локален и далечен директориум кога апликацијата е затворена"
+msgstr ""
+"Зачувај го последниот локален и далечен директориум кога апликацијата е "
+"затворена"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Поврзи се со оддалечениот сервер при стартување"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
-msgstr "Автоматски поврзи се со далечниот сервер кога се стартува апликацијата."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+"Автоматски поврзи се со далечниот сервер кога се стартува апликацијата."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Истечено време на мрежно чекање:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Истеченото време за чекање на мрежен влез/излез. Ова НЕ е неактивно истечено "
 "време"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Повторни обиди за поврзување"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Број на автоматски обиди за повторно поврзување. Поставете го на 0 за "
 "бесконечен број на обиди"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Пауза помеѓу повторни обиди"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Број на секунди помеѓу обиди за повторно поврзување"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/S"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Максимални KB/s кои може да ги добие еден трансфер. (Постави на 0 за "
 "оневозможување)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Големина на блокот на трансферот"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Големина на блокот кој се користи кога се трансферираат датотеки. Ова треба "
 "да е делливо со 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Предефиниран Протокол:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Овде се одредува кој префиниран протокол да се користи"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Овозможи подршка за IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -644,27 +660,27 @@ msgstr ""
 "Овде се дефинира што ќе се случи при двоклик на датотека во листата на "
 "датотеки. 0=Прикажи датотека 1=Уреди датотека 2=Пренеси датотека"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Предефинирана ширина на листата со локални датотеки"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Предефинирана ширина на листата со мрежни датотеки"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Предефинирана висина на листите со локални/мрежни датотеки"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Предефинирана висина на листата за трансфер"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Предефинирана висина на прозорецот за логирање"
 
-#: ../lib/options.h:177
+#: 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."
@@ -672,15 +688,15 @@ msgstr ""
 "Ширина на колоната за име на датотеката во прозорецот за трансфер. Постави "
 "на 0 за автоматска ширина на колоната."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Предефинирана колона по која да се подреди"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Подреди опаѓачки или растечки"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -689,7 +705,7 @@ msgstr ""
 "0 за автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа "
 "колона"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -697,7 +713,7 @@ msgstr ""
 "Ширината на колоната за големина во листата на датотеки. Постави на 0 за "
 "автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа колона"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -705,7 +721,7 @@ msgstr ""
 "Ширината на корисничката колоната во листата на датотеки. Постави на 0 за "
 "автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа колона"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -713,7 +729,7 @@ msgstr ""
 "Ширината на колоната за група во листата на датотеки. Постави на 0 за "
 "автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа колона"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -721,7 +737,7 @@ msgstr ""
 "Ширината на колоната за дата во листата на датотеки. Постави на 0 за "
 "автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа колона"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -729,82 +745,75 @@ msgstr ""
 "Ширината на колоната за атрибути во листата на датотеки. Постави на 0 за "
 "автоматска ширина на колоната. Постави на -1 за да се оневозможи оваа колона"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Боја на наредбите кои се испраќаат до серверот"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Боја на наредбите кои се примаат од серверот"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Боја на пораките за грешка"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Боја на останатите лог пораки"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Локален"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Обележувач"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, 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:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Грешка во поставувањето на LC_TIME во '%s'. Се враќам назад на %s\n"
 
-#: ../lib/protocols.c:389
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Го вчитувам листањето на директориумот %s од кешот (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Вчитувам листање на директориумот %s од серверот (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:461
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Грешка во претворањето на низата '%s\" од карактерите %s во карактери %s: %"
-"s\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -813,169 +822,111 @@ msgstr ""
 "Предупредување: Тргнување на патеката од датотеката '%s'. Отргнатата патека "
 "(%s) не одговара на тековниот директориум (%s)\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Грешка: Не може да се запише во кешот: %s\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Грешка: Не може да се пронајде обележувач %s\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Обележувачка грешка: Записот за обележувач %s нема hostname\n"
 
-#: ../lib/protocols.c:842 ../lib/protocols.c:869
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\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 "Не можам да го најдам hostname-от %s: %s\n"
-
-#: ../lib/protocols.c:2091
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Најдов рекурзивна симболичка врска %s\n"
 
-#: ../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 "Грешка: Не можам да поставам затворање на извршното знаменце: %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:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Грешка: Далечната локација %s е одврзана. Максималниот број на повторни "
 "обиди е достигнат...операцијата се откажува\n"
 
-#: ../lib/protocols.c:3072
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "Грешка: Далечната локација %s е одврзана. Повторен обид за %d секунди\n"
+msgstr ""
+"Грешка: Далечната локација %s е одврзана. Повторен обид за %d секунди\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Грешка: Не можам да поставам затворање на извршното знаменце: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Не можам да го отворам главниот pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Не може да се создаде пар сокети: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Грешка: Не може да се изврши ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Не може да се создаде нов процес: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Име на proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Име на заштитниот ѕид"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Портa за proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Порта за поврзување со заштитниот ѕид"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Корисничко име за proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Корисничко име за заштитниот ѕид"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Лозинка за proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Лозинка за заштитниот ѕид"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Користи HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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"
@@ -984,65 +935,65 @@ 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"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE наредба"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Сопствено"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Email адреса:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1050,19 +1001,19 @@ msgstr ""
 "Оваа лозинка ќе се користи секогаш кога ќе се најавувате на FTP сервер како "
 "анонимен корисник"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy сметка:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Сметка за заштитен ѕид (опционално)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Тип на proxy сервер:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1079,11 +1030,11 @@ msgstr ""
 "h (host), о (порта) или а (сметка). На пример, за да одредите корисничко име "
 "за proxy сервер, треба да напишете %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Игнорирај PASV адреса"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1095,11 +1046,11 @@ msgstr ""
 "Ова е често потребно за рутери кои ја даваат нивната внатрешна наместо "
 "нивната надворешна IP адреса во PASV одговорот."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Пасивен трансфер на датотеки"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1116,11 +1067,11 @@ msgstr ""
 "отвори порта на клиентската страна, и серверот ќе проба да се поврзе на "
 "истата."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Разреши ги далечните симболички врски (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1132,15 +1083,16 @@ msgstr ""
 "опција нема да ви треба единствено кога далечниот FTP сервер не подржува -L "
 "параметар за наредбата LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Трансфер на датотеки во ASCII мод"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1151,272 +1103,326 @@ msgstr ""
 "Доколку превземате бинарни податоци, тогаш оваа опција треба да биде "
 "оневозможена."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Добиен е неправилен одговор '%c' од серверот.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: 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 "Не може да се пронајде IP адреса во PASV одговорот '%s'\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 "Ја игнорирам 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"
 
-#: ../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
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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/sshv2.c:28
+#: 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 "Не можам да го најдам hostname-от %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
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Име SSH програма:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Патека до SSH извршната датотека"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH Додатни Параметри:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Дополнителни параметри кои ќе и се предадат на SSH програмата"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Потребно е SSH Корисничко Име/Лозинка"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Барај корисничко име/лозинка за SSH поврзувања"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Се стартува програмот %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Внесете фраза за лозинка за RSA клучот"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Внесете фраза за лозинка за клучот '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "лозинка"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(да/не)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Внесете лозинка"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Внесете сигурносна лозинка"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Грешка: Внесената лозинка не е точна\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Иницијализација на протокол\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Верзија на протокол %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Отвори %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Затвори\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Отвори директориум %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Прочитај директориум\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Одтрани датотека %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Креирај директориум %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Одстрани директориум %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Вистинска патека %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Атрибути на датотека\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Статистика %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Во ред"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Нема таква датотека или директориум"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Недозволен пристап"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Неуспех"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Лоша порака"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Нема воспоставена врска"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Врската е прекината"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Операцијата не е поддржана"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Серверот врати непозната порака"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1424,41 +1430,41 @@ msgstr ""
 "Имаше грешка во иницијализирањето на SSH врската со далечниот сервер. "
 "Следува пораката за грешка од далечниот сервер:\n"
 
-#: ../lib/sshv2.c:1134
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Се отвара SSH врска кон %s\n"
 
-#: ../lib/sshv2.c:1186
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Успешно се најавивте на SSH серверот %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL двигател"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Датотека со ентропија:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL датотека со ентропија:"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Должина на расејување на ентропија"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Максимален број на бајти за расејување на SSL двигателот со"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Верифицирај го SSL споделувач"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1474,11 +1480,11 @@ msgstr ""
 "\n"
 "Грешка %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 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 "
@@ -1487,55 +1493,45 @@ msgstr ""
 "ГРЕШКА: Хостот во SSL сертификатот (%s) не одговара на хостот на кој се "
 "поврзавме (%s). Напуштам конекција.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Не може да се иницијализира OpenSSL библиотеката\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Грешка при вчитување на предефинираните SSL сертификати\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Грешка при составување на листа на cipher-и (нема валидни cipher-и)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Грешка: SSL двигателот не е иницијализиран\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Грешка при поставување на SSL врска (BIO објект)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Грешка при поставување на SSL врска (SSL објект)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Грешка со сертификатот од другата страна: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Операцијата е откажана\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 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 ""
-">. Ако имате некои прашања, коментари или сугестии за оваа програма, ве "
-"молам слободно пишете ми на е-пошта. Можете секогаш да ги најдете најновите "
-"вести за gFTP на мојата веб страница http://www.gftp.org/\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 "
@@ -1546,73 +1542,74 @@ msgstr ""
 "редистрибуирате под одредени услови; за детали, видете ја датотеката "
 "COPYING\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Преведено од: Владимир Стефанов, Иван Стојмиров"
 
-#: ../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 <мод> <датотека>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "користење: rename <старо име> <ново име>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "користење: delete <датотека>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "користење: rmdir <директориум>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "користење: site <команда на страницата>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "користење: mkdir <нов директориум>\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 <директориум>\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"
 
-#: ../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 "користење: постави [варијабла = вредност]\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"
 
-#: ../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"
+msgstr ""
+"Грешка: Варијаблата %s не е достапна во текстуалното портирање на gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1620,327 +1617,329 @@ msgstr ""
 "Подржани команди:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "користење: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "за"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Прикажува инфромации за gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr "Го поставува тековниот режим на датотечен трансфер на Ascii (само за FTP)"
+msgstr ""
+"Го поставува тековниот режим на датотечен трансфер на Ascii (само за FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "бинарен"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Го подесува тековниот режим на трансфер во Бинарен (само за FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Го променува далечниот работен директориум"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Ги променува дозволите за далечната датотека"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Достапни опции: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Дисконектира од далечната страница"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "избриши"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Отстранува далечна датотека"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Прикажува список на директориум за тековниот директориум"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Презема далечна датотека(и)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Го прикажува овој помошен екран"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Го променува локалниот директориум за работа"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Ги прменува дозволите за локална датотека"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Отстранува локална датотека"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
-msgstr "Го прикажува списокот на директориумот за тековниот локален директориум"
+msgstr ""
+"Го прикажува списокот на директориумот за тековниот локален директориум"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Креира локален директориум"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Го прикажува тековниот локален директориум"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Преименува локална датотека"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Отстранува локален директориум"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Креира далечен директориум"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Испраќа локална датотека(и)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Отвара конекција до одалечената страница"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Го прикажува тековниот далечен директориум"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Излегува од gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Преименува далечна датотека"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Отстранува далечен директориум"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Прикажува варијабли на конфигурациската датотека. Можете исто така да ги "
 "поставите варијаблите преку set var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Изврши специфична команда на сајтот"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 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 "
 "log for which items were not properly transferred."
 msgstr ""
-"Имаше %d датотеки и директориуми кои не можеа да се пренесат. Проверете "
-"го логот за да видите кои предмети не се пренесоа правилно."
+"Имаше %d датотеки и директориуми кои не можеа да се пренесат. Проверете го "
+"логот за да видите кои предмети не се пренесоа правилно."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Ве молиме прво притиснете го стоп копчето пред да правите што било "
 "друго\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Изврши обележувач"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Додади обележувач: Мора да внесете име за обележувачот\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Додади обележувач: Не може да се додаде обележувач %s бидејќи името веќе "
 "постои\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Додади обележувач"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Додади обележувач: Мора да внесете име на компјутер\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1950,31 +1949,31 @@ msgstr ""
 "Можете да ги одделите елементите со / за да ги поставите во подмени\n"
 "(пр: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Запамети лозинка"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Мора да одредите име за обележувачот."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Нова папка"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Внесете го името на новата папка за создавање"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Нов елемент"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Внесете го името за создавање на новиот елемент"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1983,106 +1982,99 @@ msgstr ""
 "Дали сте сигурни дека сакате да го избришете обележувачот\n"
 "%s и сите негови деца?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Избриши обележувач"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Обележувачи"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Уреди внес"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Име на хост:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Порта:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Далечен директориум:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Локален директориум:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Сметка:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Откажи  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Датотека"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Датотека/откачи"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Датотека/Нова _папка..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Датотека/Нов _елемент..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Датотека/_Избриши"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Датотека/_Својства..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Датотека/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Датотека/_Затвори"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Уреди обележувачи"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2090,93 +2082,92 @@ msgstr ""
 "Сега можете да ги подесите атрибутите на вашите датотек(и)\n"
 "Забелешка: Не сите сервери ја подржуваат chmod наредбата"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Специјално"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Лепливо"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Корисник"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Прочитај"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Запши"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Изврши"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Група"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Друго"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Дали сте сигурни дека сакате да ги избришете %ld датотеките и %ld "
 "директориумите"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Дали сте сигурни дека сакате да ги избришете овие %ld датотеки"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Дали сте сигурни дека сакате да ги избришете овие %ld директориуми"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Избриши датотеки/директориуми"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Избриши"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Поврзи"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Примен URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Повлечи и пушти"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Излез"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2184,468 +2175,455 @@ msgstr ""
 "Во тек е трансфер на датотеки\n"
 "Дали сте сигурно дека сакате да излезете?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Отвори локација"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Внеси URL кон кој да се поврзам"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/откачи"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Прозорец _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Прозорец _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Бинарно"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Преференции..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Излези"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Локално"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Локално/откачи"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Локално/_Отвори локација..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Локално/_Исклучи"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Локално/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Локално/Смени спецификации на _датотеки..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Локално/П_рикажи избор"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Локално/Избери _сѐ"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Локално/Избери ги сите датотеки"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Локално/Избери ништо"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Локално/Зачувај листинг на директориуми..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Локално/Испрати SITE наредба..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Локално/С_мени директориум"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Локално/До_зволи..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Локално/_Нова папка..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Локално/Преим_енувај..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Локално/Из_бриши..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Локално/_Уреди..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Локално/Пре_гледај..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Локално/Осве_жи"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Далечно"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Далечно/откачи"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Далечно/_Отвори локација..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Далечно/Исклу_чи"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Далечно/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Далечно/Смени спецификација на _датотека..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Далечно/Прика_жи избрано"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Далечно/Избери _се"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Далечно/Избери ги сите датотеки"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Далечно/Деселектирај се"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Далечно/Зачувај список на директориумот..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Далечно/Прати SITE команда..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Далечно/П_ромени директориум"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Далечно/_Дозволи..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Датотека/_Нова папка..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Далечно/Пре_именувај..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Далечно/И_збриши..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Далечно/_Уреди..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Далечно/Пре_глед..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Далечно/Осве_жи"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Обележувачи"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Обележувачи/откини"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Обележувачи/Додади _обележувач"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Обележувачи/Уреди обележувачи"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Обележувачи/оддели"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Трансфер"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Трансфер/откини"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Трансфер/_Почни"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Трансфер/_Запри"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Трансфер/оддели"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Трансфер/Прескокни _тековна датотека"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Трансфер/_Отстрани датотека"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Трансфер/Помести датотека _нагоре"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Трансфери/Помести датотека на_доле"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Трансфер/По_вторно превземи датотеки"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Трансфер/_Стави датотеки"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Дневник"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Дневник/откини"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Дневник/Ис_чисти"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Дневник/_Види дневник"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Дневник/_Зачувај дневник..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Алатки"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Алатки/откини"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Алатки/_Спореди прозорци"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Алатки/_Исчисти кеш"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Помош"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Помош/откини"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Помош/_За"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Домаќин: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Хост: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порта: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Корисник: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Корисник: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Лоз: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Команда: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Име на датотека"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Големина"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Датум"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Атрибути"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Напредок"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Грешка: Морате да напишете домаќин кон кој да се поврзам\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Внесете корисничко име:"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Ве молам внесете го вашето корисничко име за оваа страница"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:586 ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Ве молам внесете ја вашата лозинка за оваа страница"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Операцијата е откажана...морате да внесете низа\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Направи директориум"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Внесете име на директориумот за создавање"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Преименувај"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "како би сакале да ја преименувате %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Страница"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Внесете команда специфична за страницата"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Закачи на сајт"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Пребриши"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Продолжи"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Прескокни"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Акција"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Префрли датотеки"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2653,62 +2631,61 @@ msgstr ""
 "Следната датотека(и) постои и на локалниот и на далечниот компјутер\n"
 "Ве молам изберете што сакате да правите"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Прескокни датотека"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Избери ги сите"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Одизбери ги сите"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Промена на спецификацијата на датотеката: Операцијата е откажана...морате да "
 "внесете низа\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Промени спецификација на датотеката"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Грешка: Не можам да го отворам %s за пишување: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Зачувај листање на директориум"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Грешка: Грешка при пишување во %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Успешно ја запишав датотеката за запис во %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Зачувај запис"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2717,11 +2694,11 @@ msgstr ""
 "Не можам да ја најдам датотеката за договорот за лиценца COPYING. Ве молам "
 "проверете дека е или во %s или во %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "За gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2732,27 +2709,23 @@ msgstr ""
 "Авторски права (С) 1998-2007 Брајан Масни <masneyb gftp org>\n"
 "Официјална страница: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "За"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Договор за лиценца"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  Затвори  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Спореди прозорци"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Се прекинува врската со далечниот сервер"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2760,72 +2733,56 @@ msgstr ""
 "Поврзува со страната наведена во внесот за домаќин. Ако внесот за домаѓин е "
 "празен, тогаш се појавува дијалог кој ќе ви овозможи да внесете URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Сите датотеки"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Кеширано) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Неповрзан"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Грешка во отварањето на датотеката %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Не сум поврзан на далечната страница\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Оваа можност не е достапна со користење на овој протокол\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Морате да имате изберено само една ставка\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Морате да имате изберено барем една ставка\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Промени"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Додај"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Откажи"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Да  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Не  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Го добивам листањето на директориумот"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Запри  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2834,224 +2791,255 @@ msgstr ""
 "Примени се %ld директориуми\n"
 "и %ld датотеки"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Грешка: Не може да се пронајде датотеката %s во %s или %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Уреди домаќин"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Додади домаќин"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Домејн"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Мрежна адреса"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Мрежна адреса:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Мрежна маска"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Мре_жна маска:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Домејн:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Мрежна маска"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Локалени хостови"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Уреди"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Уреди"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Опции"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Примени"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 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 "Поврзување..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Примам датотеки: Не сум поврзан со далечната страница\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Грешка: Процесот дете %d врати %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Процесот дете %d врати сигнал за успешност\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Грешка: Процесот дете %d не се затвори правилно\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Грешка: Не можам да добијам информации за датотеката %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Датотеката %s не е променета\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr "Датотеката %s се промени."
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 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 "Прим. %s од %s со %.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 "Испр. %s од %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 прибл. преостанато време. (Датотека %ld од %ld)"
+msgstr ""
+"%d%% завршено, %02d:%02d:%02d прибл. преостанато време. (Датотека %ld од %ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 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"
 
-#: ../src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Пoглед"
 
-#: ../src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Уреди"
+
+#: 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:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Отварам %s со %s\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Ја гледам датотеката %s\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Поглед: Не можам да ја отворам датотеката %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Не можам да го отворам контролниот терминал %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Корисничко име [анонимно]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s веќе постои. (%s изворна големина, %s дестинациона големина):\n"
 "(п)ребриши, (о)бнови, п(р)ескокни, (П)ребриши се, (О)бнови се, Пре(с)кони "
 "се: (%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 ""
+#~ ">. Ако имате некои прашања, коментари или сугестии за оваа програма, ве "
+#~ "молам слободно пишете ми на е-пошта. Можете секогаш да ги најдете "
+#~ "најновите вести за gFTP на мојата веб страница http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Откажи  "
+
+#~ msgid "Host: "
+#~ msgstr "Домаќин: "
+
+#~ msgid "User: "
+#~ msgstr "Корисник: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Затвори  "
+
+#~ msgid "Add"
+#~ msgstr "Додај"
+
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Да  "
+
+#~ msgid "  No  "
+#~ msgstr "  Не  "
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Network Address"
+#~ msgstr "Мрежна адреса"
+
+#~ msgid "_Edit"
+#~ msgstr "_Уреди"
+
+#~ msgid "Apply"
+#~ msgstr "Примени"
diff --git a/po/ml.po b/po/ml.po
index 9a0a63d..6553c8d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,10 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version:gftp\n"
-"POT-Creation-Date: 2003-06-06 03:56+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale gnu org in>\n"
 "Language-Team: Malayalam <locale gnu org in>\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,690 +26,809 @@ msgstr ""
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr ""
 
-#: lib/cache.c:136 lib/local.c:532
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr ""
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:289 lib/misc.c:295 lib/rfc2068.c:263 lib/sshv2.c:997
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr ""
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 ""
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr ""
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr ""
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr ""
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: lib/config_file.c:442
+#: 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 ""
 
-#: lib/config_file.c:445
+#: 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:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr ""
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr ""
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:763
+#: lib/config_file.c:733
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: 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 ""
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr ""
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
+#: lib/fsp.c:189
+#, c-format
+msgid "Error: Cannot upload file %s\n"
 msgstr ""
 
-#: lib/local.c:67 lib/local.c:462
+#: lib/fsp.c:199
 #, c-format
-msgid "Could not change local directory to %s: %s\n"
+msgid "Error: Cannot write to file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:81 lib/local.c:448
+#: lib/fsp.c:237
 #, c-format
-msgid "Could not get current working directory: %s\n"
+msgid "Error: Error closing file: %s\n"
 msgstr ""
 
-#: lib/local.c:179
+#: lib/fsp.c:327
 #, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
 msgstr ""
 
-#: lib/local.c:405
+#: 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 "അറിയാത്ത"
+
+#: lib/fsp.c:377
 #, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr ""
 
-#: lib/local.c:442
+#: lib/fsp.c:436
 #, c-format
-msgid "Successfully changed local directory to %s\n"
+msgid "Successfully changed directory to %s\n"
+msgstr ""
+
+#: lib/fsp.c:446
+#, c-format
+msgid "Could not change directory to %s\n"
 msgstr ""
 
-#: lib/local.c:479 lib/local.c:502 src/gtk/transfer.c:907
-#: src/gtk/view_dialog.c:301
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr ""
 
-#: lib/local.c:485
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr ""
 
-#: lib/local.c:508 src/gtk/transfer.c:911 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr ""
 
-#: lib/local.c:525
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr ""
 
-#: lib/local.c:551
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: lib/local.c:558
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/local.c:581
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
+msgid "Could not get current working directory: %s\n"
 msgstr ""
 
-#: lib/local.c:588
+#: lib/local.c:105
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Successfully changed local directory to %s\n"
 msgstr ""
 
-#: lib/local.c:680
-msgid "local filesystem"
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:258 lib/misc.c:265 lib/protocols.c:2495
+#: lib/local.c:238
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:275 lib/protocols.c:2213 lib/sslcommon.c:467
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
 msgstr ""
 
-#: lib/misc.c:283 lib/protocols.c:2143 lib/sslcommon.c:421
+#: lib/local.c:634
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
+msgid "Successfully changed mode of %s to %o\n"
+msgstr ""
+
+#: lib/local.c:641
+#, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: lib/misc.c:434
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/local.c:676
+#, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr ""
+
+#: lib/local.c:683
+#, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr ""
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr ""
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr ""
+
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ഒന്നും"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr ""
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "വലിപ്പം"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr ""
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "കൂട്ടം"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "സാര്‍വത്രികമായ"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr ""
 
-#: lib/options.h:38
+#: 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:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr ""
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr ""
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr ""
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr ""
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr ""
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr ""
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr ""
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr ""
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
 msgstr ""
 
-#: lib/options.h:75
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr ""
+
+#: lib/options.h:85
+msgid "Preserve file times of transferred files"
+msgstr ""
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr ""
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+msgid "Refresh the listbox after each file is transferred"
 msgstr ""
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr ""
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr ""
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1048
-#: src/gtk/options_dialog.c:1141
+#: lib/options.h:100
+msgid "Show transfer status in title"
+msgstr ""
+
+#: lib/options.h:102
+msgid "Show the file transfer status in the titlebar"
+msgstr ""
+
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr ""
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr ""
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "വലക്കെട്ട്"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: lib/options.h:94
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:111
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr ""
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr ""
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: lib/options.h:135
+#: 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 ""
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr ""
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr ""
 
-#: lib/options.h:210
+#: lib/options.h:270
 msgid "Local"
 msgstr "പ്രാദേശിക"
 
-#: lib/options.h:211
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
-#: lib/options.h:212 src/gtk/bookmarks.c:855
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "അടയാളം"
 
-#: lib/protocols.c:168 lib/protocols.c:193
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:322
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:467
+#: lib/protocols.c:390
 #, c-format
-msgid "Error: Cannot write to cache: %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:499
+#: lib/protocols.c:400
 #, c-format
-msgid "Error: Could not find bookmark %s\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:506
+#: lib/protocols.c:450
 #, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:609
+#: lib/protocols.c:481
 #, c-format
-msgid "The protocol '%s' is currently not supported.\n"
+msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: lib/protocols.c:926 lib/protocols.c:941 lib/protocols.c:1744
-#: lib/protocols.c:1853
+#: lib/protocols.c:514
 #, c-format
-msgid "Looking up %s\n"
+msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: lib/protocols.c:932 lib/protocols.c:947 lib/protocols.c:1749
-#: lib/protocols.c:1858
+#: lib/protocols.c:521
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1191 lib/protocols.c:1192 lib/protocols.c:1251
-#: lib/protocols.c:1258 lib/protocols.c:1337 lib/protocols.c:1338
-#: lib/protocols.c:1372
-msgid "unknown"
-msgstr "അറിയാത്ത"
-
-#: lib/protocols.c:1767 lib/protocols.c:1810 lib/rfc959.c:589 lib/rfc959.c:736
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:1773 lib/protocols.c:1872
+#: lib/protocols.c:1153
 #, c-format
-msgid "Trying %s:%d\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: lib/protocols.c:1778 lib/protocols.c:1879
+#: lib/protocols.c:1531
 #, c-format
-msgid "Cannot connect to %s: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: lib/protocols.c:1834 lib/sshv2.c:895
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:1896 lib/protocols.c:2504 lib/rfc959.c:598 lib/rfc959.c:745
+#: lib/protocols.c:1634 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 ""
 
-#: lib/protocols.c:1903
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr ""
-
-#: lib/protocols.c:2123 lib/protocols.c:2193
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: lib/protocols.c:2261
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2275
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr ""
-
-#: lib/protocols.c:2401
+#: lib/pty.c:301
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: lib/protocols.c:2409
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: lib/pty.c:284
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/pty.c:303 lib/pty.c:360
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/pty.c:316 lib/pty.c:371
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/pty.c:334
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 #, fuzzy
 msgid "Proxy port:"
 msgstr "FTP പകരക്കാരന് പ്രവേശനദ്വാരം"
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
@@ -719,106 +840,90 @@ msgstr ""
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:992
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr ""
-
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1077
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr ""
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr ""
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr ""
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr ""
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "യഥേഷ്ടം"
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ഇമെയില് വിലാസം"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -829,11 +934,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr ""
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -843,11 +960,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -855,78 +972,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr ""
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
 msgstr ""
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:756
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1419
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr ""
 
-#: lib/rfc959.c:1421
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr ""
+
+#: 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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -947,207 +1130,191 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr ""
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
 msgstr ""
 
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr ""
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "അടയാളവാക്ക്:"
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "അടയാളവാക്ക്:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
 
-#: lib/sshv2.c:304 lib/sshv2.c:329
-msgid "WARNING"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
 
-#: lib/sshv2.c:371
-msgid "Error: An incorrect password was entered\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
 msgstr ""
 
-#: lib/sshv2.c:374
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:519
+msgid "Enter SecurID Password:"
 msgstr ""
 
-#: lib/sshv2.c:377
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: lib/sshv2.c:416
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:422
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:431
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:436
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:442
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:447
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:451
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:456
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:461
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:466
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:471
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:475
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:492
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:497
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:510 src/gtk/bookmarks.c:1014 src/gtk/bookmarks.c:1251
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1106
-#: src/gtk/options_dialog.c:1308 src/gtk/transfer.c:2046
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ശരി"
 
-#: lib/sshv2.c:513
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr ""
 
-#: lib/sshv2.c:519
+#: lib/sshv2.c:699
 #, fuzzy
 msgid "Permission denied"
 msgstr "അനുവാദങ്ങള്‌"
 
-#: lib/sshv2.c:522
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:525
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: lib/sshv2.c:528
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr ""
 
-#: lib/sshv2.c:531
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "ബന്ധം നഷ്ടപ്പെട്ടു"
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: lib/sshv2.c:574
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:632 lib/sshv2.c:1116 lib/sshv2.c:1951 lib/sshv2.c:2044
-#: lib/sshv2.c:2132
+#: 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 ""
 
-#: lib/sshv2.c:638
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:714 lib/sshv2.c:727 lib/sshv2.c:749 lib/sshv2.c:817
-#: lib/sshv2.c:948 lib/sshv2.c:1039 lib/sshv2.c:1107 lib/sshv2.c:1220
-#: lib/sshv2.c:1233 lib/sshv2.c:1246 lib/sshv2.c:1259 lib/sshv2.c:1315
-#: lib/sshv2.c:1380 lib/sshv2.c:1840 lib/sshv2.c:1942 lib/sshv2.c:2035
-#: lib/sshv2.c:2120 lib/sshv2.c:2205
-msgid "Received wrong response from server, disconnecting\n"
-msgstr ""
-
-#: lib/sshv2.c:866
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: lib/sshv2.c:959
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
@@ -1172,7 +1339,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1181,112 +1352,493 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:37 src/gtk/gftp-gtk.c:912 src/gtk/menu-items.c:66
-#: src/gtk/menu-items.c:96 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr ""
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "വിവ‍ര്‌ത്തക‌ര്"
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr ""
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr ""
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr ""
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr ""
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "വൃത്തിയാക്കല്"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr ""
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr ""
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr ""
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr ""
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr ""
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr ""
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr ""
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr ""
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr ""
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr ""
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr ""
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:38
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:65
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:72
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:129 src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "അടയാളം കൂട്ടിച്ചേറ്ക്കുക"
 
-#: src/gtk/bookmarks.c:136
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:140
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr ""
 
-#: src/gtk/bookmarks.c:466 src/gtk/bookmarks.c:476
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
+msgstr ""
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "പുതിയ കൂട്"
 
-#: src/gtk/bookmarks.c:467
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:477
+#: src/gtk/bookmarks.c:473
+msgid "New Item"
+msgstr ""
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: src/gtk/bookmarks.c:550
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 
-#: src/gtk/bookmarks.c:551
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr ""
 
-#: src/gtk/bookmarks.c:578
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "അടയാളങ്ങള്‍‌"
 
-#: src/gtk/bookmarks.c:820 src/gtk/bookmarks.c:823
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
@@ -1320,7 +1872,7 @@ msgstr ""
 msgid "Username:"
 msgstr "ഉപയോക്തൃ നാമം:"
 
-#: src/gtk/bookmarks.c:972
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "അടയാളവാക്ക്:"
 
@@ -1332,1310 +1884,971 @@ msgstr ""
 msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1026 src/gtk/bookmarks.c:1261
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1117
-#: src/gtk/options_dialog.c:1319 src/gtk/transfer.c:2058
-msgid "  Cancel  "
-msgstr ""
-
-#: src/gtk/bookmarks.c:1036 src/gtk/options_dialog.c:1330
-msgid "Apply"
-msgstr "പ്രവ‍ര്ത്തികമാക്കുക"
-
-#: src/gtk/bookmarks.c:1178
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "ശേഖരം"
 
-#: src/gtk/bookmarks.c:1179
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1180
-msgid "/File/New Folder..."
-msgstr ""
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
+msgstr "പുതിയ കൂട്"
 
-#: src/gtk/bookmarks.c:1181
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+msgid "/File/New _Item..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1182
-msgid "/File/Delete"
-msgstr ""
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
+msgstr "നീക്കം ചെയ്യ‍ുക"
 
-#: src/gtk/bookmarks.c:1183
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+msgid "/File/_Properties..."
 msgstr ""
 
-#: src/gtk/bookmarks.c:1184
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1185
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+msgid "/File/_Close"
 msgstr ""
 
-#: src/gtk/bookmarks.c:1196 src/gtk/bookmarks.c:1199
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "അടയാളം പുനക്രമീകരിക്കുക"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:90
-#: src/gtk/menu-items.c:430 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:533
-msgid "Operation canceled\n"
-msgstr ""
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "സവിശേഷം"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ഒട്ടുന്ന"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:600
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ഉപയോക്താവ്"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "നിര്‍വ്വഹിക്കുക"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:601
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "കൂട്ടം"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "മറ്റുള്ളവ"
 
-#: src/gtk/delete_dialog.c:157
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:159
+#: src/gtk/delete_dialog.c:65
+#, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:69
+#, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: src/gtk/delete_dialog.c:177 src/gtk/options_dialog.c:1191
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "നീക്കം ചെയ്യ‍ുക"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr ""
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+#, fuzzy
+msgid "Connect"
+msgstr "ഘടിപ്പിക്കുക"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "പുറത്ത് കടക്കുക"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "ബദലുകള്‌"
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:161
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+msgid "/FTP/Window _1"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+msgid "/FTP/Window _2"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:164 src/gtk/gftp-gtk.c:167 src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:166
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/_Options..."
+#: src/gtk/gftp-gtk.c:275
+msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:173
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:176 src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+msgid "/Local/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "പുതിയ കൂട്"
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+msgid "/Local/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "പുതുക്കുക"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:194
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:207
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "പുതിയ കൂട്"
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+msgid "/Remote/_Delete..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "പുതുക്കുക"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "അടയാളം"
 
-#: src/gtk/gftp-gtk.c:217
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/Bookmarks/Add bookmark"
-msgstr ""
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
+msgstr "അടയാളം കൂട്ടിച്ചേറ്ക്കുക"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Edit bookmarks"
-msgstr ""
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
+msgstr "അടയാളം പുനക്രമീകരിക്കുക"
 
-#: src/gtk/gftp-gtk.c:221
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+msgid "/Transfer/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Start Transfer"
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/Stop Transfer"
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:235
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+msgid "/Log/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/View log..."
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "സഹായം"
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "കുറിപ്പ്..."
 
-#: src/gtk/gftp-gtk.c:367
-msgid "Host: "
-msgstr ""
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
+msgstr "തലവന്റെ പേര‍‌്"
 
-#: src/gtk/gftp-gtk.c:385
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:403
-msgid "User: "
-msgstr ""
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
+msgstr "ഉപയോക്താവ്"
 
-#: src/gtk/gftp-gtk.c:421
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:598 src/gtk/gftp-gtk.c:802 src/gtk/transfer.c:1887
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "രചനാനാമം"
 
-#: src/gtk/gftp-gtk.c:599
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "വലിപ്പം"
 
-#: src/gtk/gftp-gtk.c:602
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "തിയ്യതി"
 
-#: src/gtk/gftp-gtk.c:603
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:803
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "പൂരോഗതി‌"
 
-#: src/gtk/gftp-gtk.c:913 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
+#: src/gtk/gftp-gtk.c:1086
+msgid "Error: You must type in a host to connect to\n"
+msgstr ""
+
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "പുതുക്കുക"
+
+#: src/gtk/gtkui.c:120
 #, fuzzy
-msgid "Connect"
-msgstr "ഘടിപ്പിക്കുക"
+msgid "Enter Username"
+msgstr "ഉപയോക്തൃ നാമം:"
 
-#: src/gtk/gftp-gtk.c:935
-msgid "Error: You must type in a host to connect to\n"
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1170
-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";
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1172 src/text/gftp-text.c:150
-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"
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL"
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:75 src/gtk/menu-items.c:105
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/menu-items.c:127
-msgid "Connect via URL"
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
 msgstr ""
 
-#: src/gtk/menu-items.c:127
-msgid "Enter ftp url to connect to"
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "പേര‍‍് മാറ്റല്"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/menu-items.c:160
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/menu-items.c:197 src/gtk/menu-items.c:200
-msgid "Change Filespec"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/menu-items.c:200
-msgid "Enter the new file specification"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/menu-items.c:228 src/gtk/menu-items.c:600 src/gtk/menu-items.c:658
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:254
-msgid "Save Directory Listing"
+#: 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/menu-items.c:371
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
 msgstr ""
 
-#: src/gtk/menu-items.c:390 src/gtk/menu-items.c:393
-msgid "Site"
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "മേലെഴുത്ത്"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+#, fuzzy
+msgid "Resume"
+msgstr "പുനര്നാമകരണം"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "വഴുതുക"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "പ്ര‌വ‍ര്ത്തനം"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:393
-msgid "Enter site-specific command"
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
 
-#: src/gtk/menu-items.c:492 src/gtk/menu-items.c:526
-msgid "Chdir"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
 msgstr ""
 
-#: src/gtk/menu-items.c:624 src/gtk/menu-items.c:682
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr ""
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
+msgstr ""
+
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
+msgstr ""
+
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
+msgstr ""
+
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:693
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:705
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: src/gtk/menu-items.c:741
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: src/gtk/menu-items.c:745 src/gtk/menu-items.c:750
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr ""
 
-#: src/gtk/menu-items.c:781
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:782 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "വിവ‍ര്‌ത്തക‌ര്"
-
-#: src/gtk/menu-items.c:793
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "കുറിപ്പ്"
 
-#: src/gtk/menu-items.c:842
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr ""
 
-#: src/gtk/menu-items.c:848 src/gtk/view_dialog.c:377
-msgid "  Close  "
+#: src/gtk/menu-items.c:613
+msgid "Compare Windows"
 msgstr ""
 
-#: src/gtk/menu-items.c:930
-msgid "Compare Windows"
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "പുതുക്കുക"
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "മാറ്റം "
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "പേര‍‍് മാറ്റല്"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1177
-msgid "Add"
-msgstr "ചേര്‍ക്കുക"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "റദ്ദാക്കുക"
-
-#: src/gtk/misc-gtk.c:1053
-msgid "  Yes  "
-msgstr ""
-
-#: src/gtk/misc-gtk.c:1063
-msgid "  No  "
-msgstr ""
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:100
-msgid "Mkdir"
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Make Directory"
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Enter name of directory to create"
-msgstr ""
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
+msgstr "സാമ്രാജ്യം"
 
-#: src/gtk/options_dialog.c:917
-msgid "Edit Host"
+#: src/gtk/options_dialog.c:978
+msgid "_Network address:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:917
-msgid "Add Host"
-msgstr ""
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "ശൃംഖലാവരണം"
 
-#: src/gtk/options_dialog.c:949 src/gtk/options_dialog.c:1040
-msgid "Domain"
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
 msgstr "സാമ്രാജ്യം"
 
-#: src/gtk/options_dialog.c:969
-msgid "Network Address"
-msgstr ""
-
-#: src/gtk/options_dialog.c:1002 src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "ശൃംഖലാവരണം"
 
-#: src/gtk/options_dialog.c:1148
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1184 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "സംവിധാനം"
-
-#: src/gtk/options_dialog.c:1246 src/gtk/options_dialog.c:1251
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ബദലുകള്‌"
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/rename_dialog.c:111
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr ""
-
-#: src/gtk/transfer.c:166
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: src/gtk/transfer.c:282
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr ""
-
-#: src/gtk/transfer.c:309 src/gtk/transfer.c:1285
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "ബന്ധം സ്ഥാപിക്കുന്നു..."
 
-#: src/gtk/transfer.c:319 src/gtk/transfer.c:1179 src/gtk/transfer.c:1190
-msgid "Enter Password"
-msgstr ""
-
-#: src/gtk/transfer.c:320 src/gtk/transfer.c:1180 src/gtk/transfer.c:1191
-msgid "Please enter your password for this site"
-msgstr ""
-
-#: src/gtk/transfer.c:410
-msgid "Transfer Files"
-msgstr ""
-
-#: src/gtk/transfer.c:418
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/transfer.c:645
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-
-#: src/gtk/transfer.c:702
+#: src/gtk/transfer.c:336
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:732
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:1071 src/gtk/transfer.c:1157
-#: src/gtk/transfer.c:1600
-msgid "Skipped"
-msgstr ""
-
-#: src/gtk/transfer.c:841 src/gtk/transfer.c:1133 src/gtk/transfer.c:1161
-msgid "Waiting..."
+msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:984
+#: src/gtk/transfer.c:345
 #, c-format
-msgid "Error: Child %d returned %d\n"
+msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/gtk/transfer.c:987
+#: src/gtk/transfer.c:352
 #, c-format
-msgid "Child %d returned successfully\n"
+msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: src/gtk/transfer.c:999
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1007
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr ""
 
-#: src/gtk/transfer.c:1010
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr ""
 
-#: src/gtk/transfer.c:1074
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr ""
 
-#: src/gtk/transfer.c:1114
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1329
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1359
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1368
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1394
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1472 src/gtk/transfer.c:1494 src/gtk/transfer.c:1528
-#: src/gtk/transfer.c:1568 src/gtk/transfer.c:1621 src/gtk/transfer.c:1680
-msgid "There are no file transfers selected\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1512
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1553 src/gtk/transfer.c:1606
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1767 src/gtk/transfer.c:1972 src/gtk/transfer.c:2011
-msgid "Overwrite"
-msgstr "മേലെഴുത്ത്"
-
-#: src/gtk/transfer.c:1789 src/gtk/transfer.c:1982 src/gtk/transfer.c:2017
-#, fuzzy
-msgid "Resume"
-msgstr "പുനര്നാമകരണം"
-
-#: src/gtk/transfer.c:1811 src/gtk/transfer.c:1977
-msgid "Skip"
-msgstr "വഴുതുക"
-
-#: src/gtk/transfer.c:1888
-msgid "Local Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1889
-msgid "Remote Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1890
-msgid "Action"
-msgstr "പ്ര‌വ‍ര്ത്തനം"
-
-#: src/gtk/transfer.c:1892
-msgid "Download Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1892
-msgid "Upload Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1918
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-
-#: src/gtk/transfer.c:2023
-msgid "Skip File"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/gtk/transfer.c:2033
-msgid "Select All"
-msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
-
-#: src/gtk/transfer.c:2039
-msgid "Deselect All"
+#: 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 ""
 
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "കാഴ്ച"
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "സംവിധാനം"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr ""
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr ""
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr ""
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr ""
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr ""
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr ""
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr ""
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr "വൃത്തിയാക്കല്"
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr ""
-
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr ""
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr ""
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr ""
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr ""
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr ""
-
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr ""
-
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr ""
-
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr ""
-
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr ""
-
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr ""
-
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr ""
-
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr ""
-
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr ""
-
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr ""
-
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr ""
-
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr ""
-
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr ""
-
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr ""
-
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr ""
-
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr ""
-
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr ""
-
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:89
-msgid "set"
-msgstr ""
-
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-
-#: src/text/gftp-text.c:148
-msgid ""
-">.\n"
-"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 ""
-
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr ""
-
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:698
-#: src/text/gftp-text.c:716 src/text/gftp-text.c:737 src/text/gftp-text.c:811
-msgid "Error: Not connected to a remote site\n"
-msgstr ""
-
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:744
-msgid "usage: mget <filespec>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:818
-msgid "usage: mput <filespec>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:956
+#: src/text/gftp-text.c:166
 #, c-format
-msgid "Could not download %s\n"
-msgstr ""
-
-#: src/text/gftp-text.c:963
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr ""
-
-#: src/text/gftp-text.c:1030
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-
-#: src/text/gftp-text.c:1086
-msgid "usage: set [variable = value]\n"
+msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:1100
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr ""
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "ഉപയോക്തൃ നാമം:"
 
-#: src/text/gftp-text.c:1107
+#: src/text/textui.c:158
 #, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
-#: src/text/gftp-text.c:1135
-msgid "Invalid argument\n"
-msgstr ""
+#~ msgid "Apply"
+#~ msgstr "പ്രവ‍ര്ത്തികമാക്കുക"
 
-#: src/text/gftp-text.c:1160
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr ""
+#~ msgid "Add"
+#~ msgstr "ചേര്‍ക്കുക"
 
-#: src/text/gftp-text.c:1238
-msgid "Clear the directory cache\n"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "റദ്ദാക്കുക"
diff --git a/po/mr.po b/po/mr.po
index a4336be..281c2ae 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,104 +6,110 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-01-17 17:30+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-03-19 17:38+0530\n"
 "Last-Translator: Sandeep Shedmake <sandeep shedmake gmail com>\n"
 "Language-Team: marathi\n"
+"Language: mr\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"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "अवैध URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "त्रुटी: कॅशे निर्देशांक फाइल अंतर्गत अवैध %s ओळ आढळली\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "वर्णाक्षर '%1$s' यांस अक्षर संच %2$s पासून अक्षर संच %3$s असे रूपांतरन करतेवेळी त्रुटी आढळली: %4$s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"वर्णाक्षर '%1$s' यांस अक्षर संच %2$s पासून अक्षर संच %3$s असे रूपांतरन करतेवेळी त्रुटी "
+"आढळली: %4$s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "त्रुटी: स्थानिक फाइल %s उघडणे अशक्य: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "त्रुटी: सॉकेट मध्ये लिहिणे अशक्य: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "त्रुटी: सॉकेट मधून वाचणे अशक्य: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "सावधानता: मुख्य पुस्तकखूण फाइल %s आढळली नाही\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP सावधानता: पुस्तकखूण फाइल अंतर्गत %d रेघ वगळत आहे: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP सावधानता: %d रेखेत पर्याप्त प्रमाण/युक्तिवाद नाहीत\n"
 
-#: ../lib/config_file.c:504
+#: 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"
+msgstr ""
+"हा विभाग स्थानिक सबनेटवर कोणते आयोजक आहेत व प्रॉक्सी सर्वर (उपलब्ध असल्यास) च्या बाहेर "
+"जाण्याची आवश्यकता नाही हे निर्देशित करतो.   वाक्यरचना : dont_use_proxy=.domain "
+"किंवा dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -111,52 +117,52 @@ msgstr ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. टिप: "
 "फाइल वाढला वगळता सर्व बाब वैक्लपिक आहे"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "आपण मेक  स्थापना केली का?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP त्रुटी: खराब लॉग फाइल नाव %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -164,18 +170,18 @@ msgstr ""
 "gFTP करीता पुस्तकखूण फाइल. कॉपीराइट (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. सावधानता: या फाइल अंतर्गत कुठलेही प्रविष्ट टिपण्णी खोडून पुन्हा लिहीले जाईल"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"टिप: या फाइल अंतर्गत उपलब्ध परवलीचा शब्द योग्य नाही. हा अल्गोरिदम सुरक्षित नाही. "
-"हे सहसा तुम्ही ही फाइल संपादीत करतेवेळी कुणाच्याही द्वारे परवलीचा शब्द सहजपणे लक्षात ठेवण्यापासून 
टाळण्याकरीता आहे. "
-"यापूर्वी, सर्व परवलीचा शब्द पाठ्य नुरूप साठवले जात असे."
+"टिप: या फाइल अंतर्गत उपलब्ध परवलीचा शब्द योग्य नाही. हा अल्गोरिदम सुरक्षित नाही. हे "
+"सहसा तुम्ही ही फाइल संपादीत करतेवेळी कुणाच्याही द्वारे परवलीचा शब्द सहजपणे लक्षात "
+"ठेवण्यापासून टाळण्याकरीता आहे. यापूर्वी, सर्व परवलीचा शब्द पाठ्य नुरूप साठवले जात असे."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -185,673 +191,701 @@ msgstr ""
 "org>. सावधानता: या फाइल अंतर्गत कुठलेही प्रविष्ट टिपण्णी खोडून पुन्हा लिहीले जाईल. "
 "नोंदणी अंतर्गत (*) आढळल्यास, तुम्ही gFTP अंतर्गत त्यास बदलवू शकणार नाही"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<अपरिचीत>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "त्रुटी: फाइल %s अपलोड करणे अशक्य\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "त्रुटी: फाइल %s करीता लिहिणे अशक्य: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "त्रुटी: फाइल बंद करतेवेळी त्रुटी आढळली: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP सर्वर %s पासून सदोषीत फाइल यादी\n"
 
-#: ../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
+#: 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 "अपरिचीत"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP डिरेक्ट्री यादी %s प्राप्त करण्यास अशक्य: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "डिरेक्ट्रीला %s नुरूप यशस्वीरित्या बदलविले\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "डिरेक्ट्री %s नुरूप बदलवणे अशक्य\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s ला यशस्वीरित्या काढून टाकले\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "त्रुटी: डिरेक्ट्री %1$s काढून टाकणे अशक्य: %2$s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "त्रुटी: %s फाइल काढून टाकणे अशक्य: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr ""
-"SSL समर्थन कंपाईल केले नसल्यामुळे FTPS समर्थन अनुपलब्ध. "
-"जोडणी सोडून देत आहे.\n"
+msgstr "SSL समर्थन कंपाईल केले नसल्यामुळे FTPS समर्थन अनुपलब्ध. जोडणी सोडून देत आहे.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "SSL समर्थन कंपाईल केले नसल्यामुळे HTTPS समर्थन अनुपलब्ध. जोडणी सोडून देत आहे.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "वर्तमान कार्यरत डिरेक्ट्री प्राप्त करणे अशक्य: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "स्थानिक डिरेक्ट्री यशस्वीरित्या %s नुरूप बदलली\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "स्थानिक डिरेक्ट्री %s नुरूप बदलणे अशक्य: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "त्रुटी: स्थानिक फाइल %s ट्रंकेट करणे अशक्य: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "स्थानिक डिरेक्ट्री सूची %s प्राप्त करणे अशक्य: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ची पद्धत यशस्वीरित्या %o नुरूप बदलविले\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Error: %s ची पद्धत %o नुरूप बदलविले: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "यशस्वीरित्या %s चे टाइम स्टॅम्प बदलविले\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "त्रुटी: %s चे टाइम स्टॅम्प बदलवणे शक्य नाही: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "स्थानीक फाइलप्रणाली"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "वापरणी: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "काहिच नाही"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "फाइल"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "आकार"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "वापरकर्ता"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "गट"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "दिनांकवेळ"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "गुणधर्म"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "उतरत्या क्रमात"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "चढत्या क्रमात"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "सर्वसाधारण"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "अवलोकन कार्यक्रम:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
-msgstr "फाइल अवलोकन करीता वापरले गेलेले मुलभूत कार्यक्रम. हे रिक्त असल्यास, आंतरिक फाइल प्रदर्शक वापरले जाईल"
+msgstr ""
+"फाइल अवलोकन करीता वापरले गेलेले मुलभूत कार्यक्रम. हे रिक्त असल्यास, आंतरिक फाइल प्रदर्शक "
+"वापरले जाईल"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "कार्यक्रम संपादीत करा:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "फाइल संपादीत करण्याकरीता वापरले गेलेले मुलभूत कार्यक्रम."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "कमाल लॉग खिडकीचे आकार:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ पोर्टसाठी बाईट्स मधिल लॉग खिडकीचे कमाल आकार"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "दूरस्थ अक्षर संच:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 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
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "दूरस्थ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 चे मूल्य आहे. डिरेक्ट्री यादी अंतर्गत दिनांक योग्यरित्या वाचले जावे 
त्याकरीता हे निश्चित केले गेले आहे."
+msgstr ""
+"हे दूरस्थ स्थळ करीता LC_TIME चे मूल्य आहे. डिरेक्ट्री यादी अंतर्गत दिनांक योग्यरित्या वाचले "
+"जावे त्याकरीता हे निश्चित केले गेले आहे."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "कॅशे TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "समाप्त होण्याआधी कॅशे नोंदणी ठेवण्याचे एकूण सेंकद."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "फाइल स्थानांतरन समावेष करा"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "अस्तित्वातील करीता नवीन फाइल स्थानांतरन समावेष करा"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "एकावेळी एकाचे स्थानांतरन करा"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "एकावेळी एकच स्थानांतरण करायचे का?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "मुलभूतरित्या अधिलेखन करा"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "मुलभूतरित्या फाइल खोडून पुन्हा लिहा किंवा फाइल स्थानांतरन पुन्हा सुरू करा"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "फाइल परवानगी सुरक्षित ठेवा"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "स्थानांतरित फाइलची परवानगी सुरक्षित करा"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "फाइल वेळ सुरक्षित करा"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "स्थानांतरीत फाइलचे फाइल वेळ सुरक्षित करा"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "प्रत्येक फाइल स्थानांतरन नंतर पुन्ह दाखल करा"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "प्रत्येक फाइल स्थानांतरण नंतर लिस्टबॉक्स् अद्ययावत करा"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "सर्वप्रथम डिरेक्ट्रीज् क्रमवारीत लावा"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "सर्वप्रथम डिरेक्ट्रीज व त्यानंतर फाइल ठेवा"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "अदृष्य फाइल दाखवा"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "लिस्टबॉक्स अंतर्गत अदृष्य फाइल दाखवा"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "शिर्षक अंतर्गत स्थानांतरन स्थिती दाखवा"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "शिर्षकपट्टी अंतर्गत स्थानांतरन स्थिती दाखवा"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "फाइल स्थानांतरन सुरू करा"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "रांगेत असल्यावर स्वयंरित्या फाइल स्थानांतरन सुरू करा"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI अंतर्गत स्वहस्ते चालविलेले आदेश स्वीकारा"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI (पाठ्य पोर्ट नुरूप कार्यपद्धती) अंतर्गत स्वहस्ते आदेश प्रविष्ट करणे स्वीकारा"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "शेवटची डिरेक्ट्री लक्षात ठेवा"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "ऍप्लिकेशन बंद होतेवेळी शेवटचे भेट दिलेली स्थानीय व दूरस्थ डिरेक्ट्री साठवा"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "स्टार्टअपवेळी दूरस्थ सर्वरशी जुळवणी करा"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "ऍप्लिकेश सुरू केल्यावर दूरस्थ सर्वरशी स्वयंरित्या जुळवणी करा."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "जाळं"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "जाळं वेळसमाप्ती:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "जाळं इनपुट/आऊटपुट करीता प्रतीक्षा वेळसमाप्ती. ही निष्क्रिय वेळसमाप्ती नाही."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "पुनःप्रयत्न द्वारे जोडणी करा:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "एकूण कार्यान्वीतजोगी स्वयं-पुन्ह प्रयत्न. अनिश्चितरित्या प्रयत्न करण्याकरीता यांस 0 असे निश्चित करा"
+msgstr ""
+"एकूण कार्यान्वीतजोगी स्वयं-पुन्ह प्रयत्न. अनिश्चितरित्या प्रयत्न करण्याकरीता यांस 0 असे "
+"निश्चित करा"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "अकार्यक्षम वेळ करीता पुनःप्रयत्न करा:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "पुनःप्रयत्न अंतर्गत प्रतिक्षाजोगी एकूण सेकंद"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "कमाल KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "फाइल स्थानांतरणला प्राप्य कमाल KB/s. (0 ला अकार्यान्वीत असे निश्चित करा)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "ब्लॉक आकार स्थानांतरीत करा:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "स्थानांतरनवेळी वापरण्याजोगी ब्लॉक आकार. हे 1024 चे गुणाकर असायला हवे."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "मुलभूत प्रोटोकॉल:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "हे वापरण्याजोगी मुलभूत प्रोटोकॉल निर्देशित करते"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 समर्थीत करा"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=View file 1=Edit file 
2=Transfer file"
+msgstr ""
+"फाइल यादीबॉक्स मधील फाइलवर दोनदा क्लिक केल्याने काय होऊ शकेल हे ठरवते. 0=View file "
+"1=Edit file 2=Transfer file"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "स्थानिक फाइल यादीबॉक्सची मुलभूत रूंदी"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "दूरस्थ फाइल यादीबॉक्सची मुलभूत रूंदी"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "स्थानिक/दूरस्थ फाइल यादीबॉक्सची मुलभूत ऊंची"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "स्थानांतर  यादीबॉक्सची मुलभूत ऊंची"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "लॉगिंग खिडकीची मुलभूत ऊंची"
 
-#: ../lib/options.h:177
+#: 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
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "क्रमात लावण्याजोगी मुलभूत स्तंभ"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "चढत्या किंवा उतरत्या क्रमात लावा"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील फाइलनाव स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित करण्यासाठी "
+"0 अशे निश्चित करा. हा स्तंभ असक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील आकार स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित करण्यासाठी 0 "
+"अशे निश्चित करा. हा स्तंभ अक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील वापरकर्ता स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित "
+"करण्यासाठी 0 अशे निश्चित करा. हा स्तंभ असक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील गट स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित करण्यासाठी 0 अशे "
+"निश्चित करा. हा स्तंभ असक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील दिनांक स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित करण्यासाठी 0 "
+"अशे निश्चित करा. हा स्तंभ अक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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 अशे निश्चित करा "
+msgstr ""
+"फाइल यादीबॉक्स मधील गुणधर्म स्तंभाची रूंदी. या स्तंभास स्वयंरित्या पुनःआकारित करण्यासाठी 0 "
+"अशे निश्चित करा. हा स्तंभ असक्षम करण्यासाठी -1 अशे निश्चित करा "
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "सर्वरला पाठवलेल्या आदेशांचा रंग"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "सर्वरकडून प्राप्त आदेशांचा रंग"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "त्रुटी संदेशचा रंग"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "उर्वरित लॉग संदेशचा रंग"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "स्थानिक"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "पुस्तकखूण"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "फाइल स्थानांतरन %.2f KB/s पर्यंत वाढविले जाईल\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME ला '%s' असे निश्चित करतेवेळी त्रुटी. '%s' वापरत आहे\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "कॅशे पासून डिरेक्ट्री यादी %s दाखल करत आहे (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "सर्वर पासून डिरेक्ट्री यादी %s दाखल करत आहे (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "सावधानता: फाइल '%s' चे मार्ग खोडत आहे. खोडलेले मार्ग (%s) वर्तमान डिरेक्ट्री (%s) शी जुळत नाही\n"
+msgstr ""
+"सावधानता: फाइल '%s' चे मार्ग खोडत आहे. खोडलेले मार्ग (%s) वर्तमान डिरेक्ट्री (%s) शी "
+"जुळत नाही\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "त्रुटी: कॅशे लिहणे शक्य नाही: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "त्रुटी: पुस्तकखूण %s आढळली नाही\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "पुस्तखूण त्रुटी: पुस्तकखूण नोंदणी %s यांस आयोजकनाव आढळले नाही\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "प्रोटोकॉल '%s' वर्तमानक्षणी समर्थित नाही.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "वारंवारता symbolic link %s आढळले\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "त्रुटी: दूरस्थ स्थळ %s शी जोडणी तुटली. कमाल पुनःप्रयत्न पोहचले...सोडून देत आहे\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "मुख्य pty %s उघडणे अशक्य: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "सॉकेट जोडी निर्माण करणे अशक्य: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "त्रुटी: ssh कार्यान्वित करणे अशक्य: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "अन्य प्रक्रिया विभाजीत करणे अशक्य: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "प्रॉक्सी आयोजकनाव:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "फायरवॉल आयोजकनाव"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "प्रॉक्सी पोर्ट:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "फायरवॉलशी समावेष करण्याजोगी पोर्ट"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "प्रॉक्सी वापरकर्तानाव:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "आपले फायरवॉलचे वापरकर्तानाव"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "प्रॉक्सीचा परवलीचा शब्द:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "आपले फायरवॉलचा परवलीचा शब्द"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 वापरा"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -860,83 +894,85 @@ msgstr ""
 "सर्वरकडून चुकीचे प्रतिसाद प्राप्त झाले, जोडणी काढून टाकत आहे\n"
 "अवैध चंक आकार '%s' दूरस्थ सर्वर द्वारे प्राप्त झाले\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ऑफसेटवेळी फाइल स्थानांतरन सुरू करत आहे"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s फाइल पुनःप्राप्त करणे अशक्य\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "डिरेक्ट्री सूची पुनःप्राप्त करत आहे...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "सर्वरकडून चुकीचे प्रतिसाद प्राप्त झाले, जोडणी काढून टाकत आहे\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE आदेश"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP प्रॉक्सी"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "स्वपसंत"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ईमेल पत्ता:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 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
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "प्रॉक्सी खाते:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "आपले फायरवॉल खाते (वैयक्तिक)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "प्रॉक्सी सर्वर प्रकार:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -945,25 +981,33 @@ 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 "हे निर्देशित करते कि आपला प्रॉक्झी सर्वर आपणाकडून कसे प्रवेश करू इच्छिते. आपण % ने आरंभीस जोडलेली २ 
अक्षरांच्या जागी भरण्याची वर्णाक्षरे निर्देशित करू शकता जे योग्य माहितीने भरले  जातील. पहिले अक्षर 
प्रॉक्झीसाठी p किंवा FTP सर्वरच्या आयोजकासाठी h यापैकी असेल. दुसरे अक्षर u (वापरकर्ता), p (पास), h(आयोजक), o 
(पोर्ट) किंवा a (खाते) यापैकी असू शकते.उदाहरणार्थ, प्रॉक्झी सर्वर निर्देशित कर�
 ��्यासाठी, आपण %pu मध्ये टंकलिखित करू शकता"
+msgstr ""
+"हे निर्देशित करते कि आपला प्रॉक्झी सर्वर आपणाकडून कसे प्रवेश करू इच्छिते. आपण % ने आरंभीस "
+"जोडलेली २ अक्षरांच्या जागी भरण्याची वर्णाक्षरे निर्देशित करू शकता जे योग्य माहितीने भरले  "
+"जातील. पहिले अक्षर प्रॉक्झीसाठी p किंवा FTP सर्वरच्या आयोजकासाठी h यापैकी असेल. दुसरे "
+"अक्षर u (वापरकर्ता), p (पास), h(आयोजक), o (पोर्ट) किंवा a (खाते) यापैकी असू शकते."
+"उदाहरणार्थ, प्रॉक्झी सर्वर निर्देशित करण्यासाठी, आपण %pu मध्ये टंकलिखित करू शकता"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV पत्ता वगळा"
 
-#: ../lib/rfc959.c:72
+#: 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 "हे कार्यान्वीत केले असल्यास, दूरस्थ FTP सर्वरचा PASV IP पत्ता क्षेत्र दुर्लक्षीत केले जाईल व 
त्याऐवजी आयोजकाचा IP पत्ता वापरले जाईल. हे सहसा PASV प्रतिसाद करीता बाहेरील ऐवजी आंतरीक IP पत्ता प्रविष्ट 
करणाऱ्या राऊटर करीता सहसा आवश्यक असते."
+msgstr ""
+"हे कार्यान्वीत केले असल्यास, दूरस्थ FTP सर्वरचा PASV IP पत्ता क्षेत्र दुर्लक्षीत केले जाईल व "
+"त्याऐवजी आयोजकाचा IP पत्ता वापरले जाईल. हे सहसा PASV प्रतिसाद करीता बाहेरील ऐवजी "
+"आंतरीक IP पत्ता प्रविष्ट करणाऱ्या राऊटर करीता सहसा आवश्यक असते."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "निष्क्रिय फाइल स्थानांतरन"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -971,397 +1015,405 @@ msgid ""
 "to an older FTP server that doesn't support this. If this is disabled, then "
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
-msgstr "जर हे सक्षम असेल, तर दूरस्थ FTP सर्वर माहिती जोडणीसाठी पोर्टला उघडेल. जर आपण फायरवॉलच्या मागे असाल, 
तर आपणास हे सक्षम  करावे लागेल. साधारणपणे, जर आपण जुन्या FTP सर्वरला जोडत नाहीत जे यास समर्थित नाही तर हे 
सक्षम करण्याची कल्पना चांगली आहे.  जर हे असक्षम असेल, तर gFTP ग्राहकाच्या बाजूवर पोर्टला उघडेल व दूरस्थ सर्वर 
त्यांना जोडण्याचा प्रयत्न करेल."
+msgstr ""
+"जर हे सक्षम असेल, तर दूरस्थ FTP सर्वर माहिती जोडणीसाठी पोर्टला उघडेल. जर आपण "
+"फायरवॉलच्या मागे असाल, तर आपणास हे सक्षम  करावे लागेल. साधारणपणे, जर आपण जुन्या FTP "
+"सर्वरला जोडत नाहीत जे यास समर्थित नाही तर हे सक्षम करण्याची कल्पना चांगली आहे.  जर हे "
+"असक्षम असेल, तर gFTP ग्राहकाच्या बाजूवर पोर्टला उघडेल व दूरस्थ सर्वर त्यांना जोडण्याचा "
+"प्रयत्न करेल."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "दूरस्थ सिमलिंक्स् (LIST -L) चे निर्धारण करा"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
-msgstr "दूरस्थ FTP सर्वर धारक दाखवलेल्या (डिरेक्ट्री) धारकामध्ये सारख्या दुव्यांना सोडण्याचा प्रयत्न करेल. 
साधारणपणे, सक्षम करून सोडून देणे ही चांगली कल्पना आहे.  जर दूरस्थ FTP सर्वर -L पर्याय LIST समर्थन देत नसेल 
त्यावेळी फक्त आपणास ते असक्षम करावे असे वाटेल"
+msgstr ""
+"दूरस्थ FTP सर्वर धारक दाखवलेल्या (डिरेक्ट्री) धारकामध्ये सारख्या दुव्यांना सोडण्याचा प्रयत्न "
+"करेल. साधारणपणे, सक्षम करून सोडून देणे ही चांगली कल्पना आहे.  जर दूरस्थ FTP सर्वर -L "
+"पर्याय LIST समर्थन देत नसेल त्यावेळी फक्त आपणास ते असक्षम करावे असे वाटेल"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII पद्धतीत फाइल स्थानांतरन करा"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
-msgstr "जर आपण पाठ्य फाइलंचे विन्डोज ते UNIX बॉक्समध्ये  किंवा उलटप्रकारे स्थानांतर करत असाल, तेव्हा आपण 
त्यास सक्षम करायला हवे.  प्रत्येक पद्धती पाठ्य फाइलंसाठी वेगळ्याप्रकारे नवीन ओळींना दाखवते. जर आपण UNIX ते 
UNIX स्थानांतर करत असेल, तर यास बंद करून सोडून देणे हे सुरक्षित आहे.  जर आपण बैनरी माहिती उतरवून घेत असाल, तर 
आपणास हे असक्षम करावे असे वाटेल."
+msgstr ""
+"जर आपण पाठ्य फाइलंचे विन्डोज ते UNIX बॉक्समध्ये  किंवा उलटप्रकारे स्थानांतर करत असाल, "
+"तेव्हा आपण त्यास सक्षम करायला हवे.  प्रत्येक पद्धती पाठ्य फाइलंसाठी वेगळ्याप्रकारे नवीन "
+"ओळींना दाखवते. जर आपण UNIX ते UNIX स्थानांतर करत असेल, तर यास बंद करून सोडून देणे हे "
+"सुरक्षित आहे.  जर आपण बैनरी माहिती उतरवून घेत असाल, तर आपणास हे असक्षम करावे असे वाटेल."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: 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:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "डेटा जुळणी निर्माण करू शकत नाही: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "पोर्ट बंदिस्त करणे अशक्य: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6 सॉकेट बनवण्यास अशक्य: %s\n"
 
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "अवैध EPSV प्रतिसाद '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "स्थानिक सॉकेटचा पत्ता प्राप्त करणे अशक्य: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "सर्वर कडून जुळणी स्वीकारू शकत नाही: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "एकूण"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "सॉकेट फ्लॅग प्राप्त करणे अशक्य: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "सॉकेट विना-बांधणी करीता निश्चित करणे अशक्य: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH कार्यक्रमाचे नाव:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "कार्यान्वित करण्याजोगी SSH मार्ग"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH अतिरिक्त परिमाणे:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH कार्यक्रम पास करण्यासाठी अतिरिक्त परिमाणे"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH वापरकर्ता/पास आवश्यक"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH जुळणींसाठी वापरकर्तानाव/परवलीचा शब्द आवश्यक आहे"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "%s कार्यक्रम चालू करत आहे\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA कि करीता वाक्यरचना प्रविष्ट करा"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "कि करीता वाक्यरचना प्रविष्ट करा"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "परवलीचा शब्द"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "परवलीचा शब्द"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(होय/नाही)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE प्रविष्ट करा:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "परवलीचा शब्द प्रविष्ट करा"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID परवलीचा शब्द प्रविष्ट करा:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "त्रुटी: चुकीचा परवलीचा शब्द प्रविष्ट केले आहे\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: प्रोटोकॉल प्रारंभिकरण\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: प्रोटोकॉल आवृत्ती %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: उघडा %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: बंद करा\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: उघडलेली डिरेक्ट्री %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: वाचन डिरेक्ट्री\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: फाइल %s काढून टाका\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: डिरेक्ट्री %s बनवा\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: डिरेक्ट्री %s काढून टाका\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: वास्तविक मार्ग %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: फाइलचे गुणधर्म\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ठीक आहे"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "या प्रकारची फाइल किंवा डिरेक्ट्री नाही"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "परवानगी नाकारली"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "अपयशी"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "खराब संदेश"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "जुळणी नाही"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "संपर्क हरवले"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "कार्य समर्थीत नाही"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "सर्वरकडून अपरिचीत संदेश परत प्राप्त झाले"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "त्रुटी: संदेश आकार %d अतिशय मोठा\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
+msgstr ""
+"दूरस्थ सर्वरशी SSH जोडणी प्रारंभ करताना त्रुटी आढळली. दूरस्थ सर्वर त्रुटी संदेश खालील "
+"प्रमाणे आहे:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s करीता SSH जुळणी उघडत आहे\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH सर्वर %s मध्ये यशस्वीरित्या प्रवेश केले\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL इंजिन"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL एन्ट्रोपी फाइल:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL एन्ट्रोपी फाइल"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "एन्ट्रोपी मांडणीची लांबी:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL इंजिनची मांडणी करण्यासाठी आवश्यक बाईट्सची कमाल संख्या"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL Peer वैध करा"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1374,56 +1426,58 @@ msgstr ""
 "विषय = %s\n"
 "त्रुटी %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "पियर प्रमाणपत्र प्राप्त करणे अशक्य\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
-msgstr "ERROR: SSL प्रमाणपत्र (%s) मधील आयोजक आपण जोडलेल्या (%s) आयोजकाशी नुरूप नाही. जोडणी सोडत आहे.\n"
+msgstr ""
+"ERROR: SSL प्रमाणपत्र (%s) मधील आयोजक आपण जोडलेल्या (%s) आयोजकाशी नुरूप नाही. "
+"जोडणी सोडत आहे.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL लायब्ररी प्रारंभ करण्यास अपयशी\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "मुलभूत SSL प्रमाणपत्रे दाखल करण्यास त्रुटी\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "सीफर यादी (वैध सीफर नाहीत) निश्चित करतेवेळी त्रुटी\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "त्रुटी: SSL इंजिनास प्रारंभ केलेले नव्हते\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL जुळणीच निश्चित करतेवेळी त्रुटी (BIO वस्तू)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL जुळणी निश्चित करतेवेळी त्रुटी (SSL वस्तू)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "पियर प्रमाणपत्र मध्ये त्रुटी: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "कार्य रद्द केले\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "पुन्हा जोडणी करण्याचा प्रयत्न करण्याआधी %d सेकंद थांबत आहे\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1433,75 +1487,76 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it under certain "
 "conditions; for details, see the COPYING file\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
-"संदिप शेडमाके <sandeep shedmake gmail com>, 2009;"
-"http://downloads.bosslinux.in/Translated_Po_files/GNOME-Translations/po%20files/Marathi%20mr/Extra%20files/gftp.po,
 2008."
-
-#: ../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
+"संदिप शेडमाके <sandeep shedmake gmail com>, 2009;http://downloads.bosslinux.in/";
+"Translated_Po_files/GNOME-Translations/po%20files/Marathi%20mr/Extra%20files/"
+"gftp.po, 2008."
+
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "वापरणी: chmod <पद्धत> <फाइल>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "वापरणी: rename <जुणे नाव> <नवीन नाव>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "वापरणी: delete <फाइल>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "वापरणी: rmdir <डिरेक्ट्री>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "वापरणी: site <स्थळ आदेश>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "वापरणी: mkdir <नवीन डिरेक्ट्री>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "वापरणी: chdir <डिरेक्ट्री>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "अवैध घटक\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "डिरेक्ट्री कॅशे पुसा\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "वापरणी: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "usage: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "त्रुटी: अस्थिर मूल्य %s हे वैध संयोजना मूल्य नाही.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1509,319 +1564,323 @@ msgstr ""
 "समर्थित आदेश:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "वापरणी: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP माहिती दाखविते"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "वर्तमान स्थानांतरन पद्धत ASCII करीता निश्चित करते (फक्त FTP साठी)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "वर्तमान फाइल स्थानांतरन पद्धत बायनरी करीता निश्चित करते (फक्त FTPसाठी)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "दूरस्थ कार्यरत डिरेक्ट्री बदलते"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "दूरस्थ फाइल परवानगी बदलते"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "उपलब्ध पर्याय: कॅशे"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "दूरस्थ स्थळ पासून जोडणी मोडते"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "दूरस्थ फाइल काढून टाकते"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "वर्तमान दूरस्थ डिरेकट्री करीता डिरेक्ट्री सूची दाखवते"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "दूरस्थ फाइल डाऊनलोड करा"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "या पडद्यावर मदत दाखवते"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "स्थानिक कार्यरत डिरेक्ट्री बदलते"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "स्थानिक फाइल परवानगी बदलते"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "स्थानिक फाइल काढून टाकते"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "वर्तमान स्थानिक डिरेक्ट्री करीता डिरेक्ट्री यादी दाखवते"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "स्थानिक डिरेक्ट्री बनवते"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "वर्तमान स्थानिक डिरेक्ट्री दाखवा"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "स्थानिक फाइल पुन्हनामांकीत करा"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "स्थानिक डिरेक्ट्री काढून टाका"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "दूरस्थ डिरेक्ट्री बनवते"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "स्थानिक फाइल अपलोड करते"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "दूरस्थ संकेत स्थळ जोडणी उघडते"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "वर्तमान दूरस्थ डिरेक्ट्री दाखवा"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP पासून बाहेर पडा"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "दूरस्थ फाइल पुन्हनामांकीत करा"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "दूरस्थ डिरेक्ट्री काढून टाका"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "संयोजना फाइल अस्थिर घटक दाखवा. तुम्ही var=val अस्थिर घटक देखिल निश्चित करू शकता"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"संयोजना फाइल अस्थिर घटक दाखवा. तुम्ही var=val अस्थिर घटक देखिल निश्चित करू शकता"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "स्थळ निर्देशीत आदेश चालवाd"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "त्रुटी: अपरिचित आदेश\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "आयोजक %2$s वरील %1$s फाइल वगळत आहे\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "आयोजक %s वरील स्थानांतरन थांबवत आहे\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s मधून %s डाऊनोलड अशक्य\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
-msgstr "%d फाइल किंवा डिरेक्ट्री स्थानांतरीत करणे अशक्य. स्थानांतरन योग्यरित्या न झालेल्या घटकं 
तपासण्याकरीता लॉग तपासा."
+msgstr ""
+"%d फाइल किंवा डिरेक्ट्री स्थानांतरीत करणे अशक्य. स्थानांतरन योग्यरित्या न झालेल्या घटकं "
+"तपासण्याकरीता लॉग तपासा."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: काहिही करण्याअगोदर कृपया सर्वप्रथम थांबवा बटण दाबा\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "पुस्तकखूण चालवा"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "पुस्तकखूण समावेष करा: आपणांस पुस्तकखूण करीता नाव प्रविष्ट करायला हवे\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "पुस्तकखूण समावेष करा: ते नाव आधीपासूनच अस्तित्वात असल्याने पुस्तकखूण %s समाविष्ट करणे अशक्य\n"
+msgstr ""
+"पुस्तकखूण समावेष करा: ते नाव आधीपासूनच अस्तित्वात असल्याने पुस्तकखूण %s समाविष्ट करणे अशक्य\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "पुस्तकखूण समावेष करा"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "पुस्तकखूण समावेष करा: आपणांस आयोजकनाव प्रविष्ट करायला हवे\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1831,31 +1890,31 @@ msgstr ""
 "उपमेन्यू अंतर्गत समावेष करण्याकरीता आपण / द्वारे बाबींना विभाजित करू शकता\n"
 "(उदा: Linux स्थळ/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "परवलीचा शब्द लक्षात ठेवा"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "पुस्तकखूण करीता तुम्ही नाव निश्चित केले पाहिजे."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "नवीन फोल्डर"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "बनविण्याजोगी नवीन फोल्डरचे नाव प्रविष्ट करा"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "नवीन बाब"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "बनविण्याजोगी नवीन बाब प्रविष्ट करा"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1864,106 +1923,99 @@ msgstr ""
 "तुम्हाला नक्की पुस्तकखूण\n"
 "%s व उप घटक खोडायचे?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "पुस्तकखूण नष्ट करा"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "पुस्तकखूण"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "नोंदणी संपादीत करा"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "वर्णन:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "आयोजक नाव:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "पोर्ट:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "प्रोटोकॉल:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "दूरस्थ डिरेक्ट्री:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "स्थानिक डिरेक्ट्री:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "वापरकर्तानाव:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "परवलीचा शब्द:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "खाते:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  रद्द करा  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/फाइल (_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/फाइल/काढूण टाका"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/फाइल/नवीन फोल्डर (_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/फाइल/नवीन घटक (_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/फाइल/नष्ट करा (_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/फाइल/गुणधर्म (_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/फाइल/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/फाइल/बंद करा (_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "पुस्तकखूण संपादीत करा"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1971,91 +2023,90 @@ msgstr ""
 "तुम्ही आता फाइलचे गुणधर्म अनूकूल करू शकता\n"
 "टिपा: सर्व ftp सर्वर chmod वैशिष्ट्य करीता समर्थन देत नाही"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "विशेष"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "चिपकाऊ"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "वापरकर्ता"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "वाचन"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "लेखन"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "कार्यन्वीत"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "गट"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "इतर"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "या %ld फाइल व %ld डिरेक्ट्रीज  काढून टाकायच्या आहेत याची आपणांस खातरी आहे का"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "तुम्हाला नक्की या %ld फाइल नष्ट करायचे"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "तुम्हाला नक्की या %ld डिरेक्ट्री नष्ट करायचे"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "फाइल/डिरेक्ट्रीज नष्ट करा"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "नष्ट करा"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "जुळवा"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s प्राप्त झाले\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ओढा-व-टाका"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "बाहेर पडा"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2063,468 +2114,455 @@ msgstr ""
 "फाइल स्थानांतरनाची  प्रक्रिया चालू आहेत.\n"
 "आपणांस खरोखरीच बाहेर पडायचे आहे का?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "स्थान उघडा"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "जुळवणी करीता URL प्रविष्ट करा"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FTP (_F)"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/खिडकी 1 (_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/खिडकी 2 (_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii (_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/बायनरी (_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/आवड निवड (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/बाहेर पडा (_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/स्थानीय (_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/स्थानीय/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/स्थानीय/स्थान उघडा (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/स्थानीय/जुळवणी तोडा (_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/स्थानीय/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/स्थानीय/फाइल संयोजना बदला (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/स्थानीय/निवडलेले दाखवा (_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/स्थानीय/सर्व निवडा (_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/स्थानीय/सर्व फाइल निवडा"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/स्थानीय/सर्व निवडलेले अशक्य करा"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/स्थानीय/डिरेक्ट्री यादी साठवा..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/स्थानीय/SITE आदेश पाठवा..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/स्थानीय/डिरेक्ट्री बदला (_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/स्थानीय/परवानगी (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/स्थानीय/नवीन फोल्डर (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/स्थानीय/पुन्हनामांकन (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/स्थानीय/नष्ट करा (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/स्थानीय/संपादीत करा (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/स्थानीय/अवलोकन (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/स्थानीय/पुन्ह दाखल करा (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/दूरस्थ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/दूरस्थ/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/दूरस्थ/स्थान उघडा (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/दूरस्थ/जुळवणी तोडा (_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/दूरस्थ/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/दूरस्थ/फाइल संयोजना बदला (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/दूरस्थ/निवडलेले दाखवा (_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/दूरस्थ/सर्व निवडा (_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/दूरस्थ/सर्व फाइल निवडा"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/दूरस्थ/सर्व निवडलेले अशक्य करा"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/दूरस्थ/डिरेक्ट्री यादी साठवा..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/दूरस्थ/SITE आदेश पाठवा..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/दूरस्थ/डिरेक्ट्री बदला (_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/दूरस्थ/परवानगी (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/दूरस्थ/नवीन फोल्डर (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/दूरस्थ/पुन्हनामांकन (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/दूरस्थ/नष्ट करा (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/दूरस्थ/संपादीत करा (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/दूरस्थ/अवलोकन (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/दूरस्थ/पुन:दाखल (_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/पुस्तकखूण (_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/पुस्तकखूण/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/पुस्तकखूण/पुस्तकखूण समावेष करा (_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/पुस्तकखूण/पुस्तकखूण संपादीत करा"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/पुस्तकखूण/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/स्थानांतरन (_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/स्थानांतरन/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/स्थानांतरन/सुरू करा (_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/स्थानांतरन/थांबवा (_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/स्थानांतरन/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/स्थानांतरन/वर्तमान फाइल वगळा (_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/स्थानांतरन/फाइल काढूण टाका (_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/स्थानांतरन/फाइल वर हलवा (_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/स्थानांतरन/फाइल खाली हलवा (_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/स्थानांतरन/फाइल प्राप्त करा (_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/स्थानांतरन/फाइल जमवा (_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/लॉग (_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/लॉग/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/लॉग/पुसा (_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/लॉग/अवलोकन (_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/लॉग/साठवा (_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/साधन (_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/साधन/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/साधन/खिकडीची तुलना करा (_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/साधन/कॅशे पुसा (_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/मदत"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/मदत/काढूण टाका"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/मदत/विषयी (_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "आयोजक: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "आयोजक (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "पोर्ट: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "वापरकर्ता: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "वापरकर्ता (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "पास: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "आदेश: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "फाइलनाव"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "आकार"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "दिनांक"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "गुणधर्म"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "प्रगती"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "त्रुटी: जोडण्यासाठी आपणांस आयोजक टंकलिखित करावा लागेल\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "पुन्हदाखल"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "वापरकर्ता नाव प्रविष्ट करा"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "कृपया या स्थळासाठी आपले वापरकर्ता नाव प्रविष्ट करा"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "कृपया या स्थळासाठी आपला परवलीचा शब्द प्रविष्ट करा"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "कार्य रद्द केले... तुम्ही वर्णाक्षर प्रविष्ट करायला हवे\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "डिरेक्ट्री बनवा"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "बनविण्याजोगी डिरेक्ट्रीचे नाव प्रविष्ट करा"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Rename"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s ला तुम्ही इतर नाव काय द्याल?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "स्थळ-निर्देशीत आदेश प्रविष्ट करा"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE असे पूर्व समावेष करा"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "खोडून लिहा"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "पुन्हा चालू करा"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "वगळा"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "कृती"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "फाइलंचे स्थानांतरन करा"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2532,70 +2570,72 @@ msgstr ""
 "खालील फाइल दोन्ही स्थानिक व दूरस्थ संगणकावर अस्तित्वात आहे\n"
 "तुम्हाला काय करायचे कृपया ते निवडा"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "त्रुटी"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "फाइल वगळा"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "सर्व निवडा"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "सर्व निवडू नका"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "फाइल संयोजना बदला: कार्य रद्द केले...आपणांस वर्णाक्षर प्रविष्ट करावे लागेल\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "फाइल संयोजना बदला"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "त्रुटी: लिहिण्यासाठी %s उघडणे अशक्य: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "डिरेक्ट्री सूची साठवा"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "त्रुटी: %s मध्ये लिहीतेवेळी त्रुटी आढळली: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s करीता लॉग फाइल यशस्वीरित्या लिहिली\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "लॉग साठवा"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "परवाना करार फाइल COPYING आढळली नाही. ती %s किंवा %s यापौकी कशात आहे कृपया याची खात्री करा"
+msgstr ""
+"परवाना करार फाइल COPYING आढळली नाही. ती %s किंवा %s यापौकी कशात आहे कृपया याची "
+"खात्री करा"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP विषयी"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2606,98 +2646,80 @@ msgstr ""
 "कॉपीराइट (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "अधिकृत मुख्यपान: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "विषयी"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "परवाना करार"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  बंद करा  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "खिडक्यांची तुलना करा"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "दूरस्थ सर्वर पासून जुळवणी मोडा"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
-msgstr "आयोजक नोंदणी अंतर्गत निर्देशीत स्थळाशी जुळवणी करा. आयोजकाची नोंदणी रिकामी असल्यास, एक संवाद प्रस्तुत 
केले जाईल जे तुम्हाला URL प्रविष्ट करण्याकरीता परवानगी देते."
+msgstr ""
+"आयोजक नोंदणी अंतर्गत निर्देशीत स्थळाशी जुळवणी करा. आयोजकाची नोंदणी रिकामी असल्यास, एक "
+"संवाद प्रस्तुत केले जाईल जे तुम्हाला URL प्रविष्ट करण्याकरीता परवानगी देते."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "सर्व फाइल"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (कॅशे केलेले) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "जोडलेले नाही"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s फाइल उघडण्यात त्रुटी: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: दूरस्थ स्थळाशी जोडले नाही\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: या प्रोटोकॉलचा वापर करून हे वैशिष्ट्य उपलब्ध होत नाही\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: तुमच्या फक्त एकच घटक निवडलेले असायला हवे\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: तुमच्याकडे किमान एक निवडलेले घटक असायला हवे\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "बदल"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "समावेष करा"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "रद्द करा"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  हो  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  नाही  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "डिरेक्ट्री सूची प्राप्त करत आहे"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  थांबा  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2706,109 +2728,89 @@ msgstr ""
 "%ld डिरेक्ट्रीज व\n"
 "%ld फाइल प्राप्त झाले"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP त्रुटी: %2$s किंवा %3$s अंतर्गत %1$s फाइल आढळली नाही\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "आयोजक संपादीत करा"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "आयोजक समावेष करा"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "प्रकार:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "प्रकार (_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "क्षेत्र"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "जाळं पत्ता"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "जाळं पत्ता (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "नेटमास्क"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "नेटमास्क (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "क्षेत्र (_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "नेटमास्क"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "स्थानिक आयोजक"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "संपादीत करा"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "संपादीत करा (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "पर्याय"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "लागू करा"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "फाइल नाव प्राप्त होत आहे..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "जुळवत आहे..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "फाइल प्राप्त करा: दूरस्थ स्थळाशी जोडले नाही\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "त्रुटी: उप %d ने %d पाठवले\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "उप %d यशस्वीरित्या पाठवले\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "त्रुटी: उप %d योग्यरित्या समाप्त झाले नाही\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "त्रुटी: %s फाइल विषयी माहिती प्राप्त करणे अशक्य: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "फाइल %s बदलली नाही\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2817,115 +2819,153 @@ msgstr ""
 "फाइल %s बदलली आहे.\n"
 "आपणांस ती अपलोड करायची?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "फाइल संपादीत करा"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "पूर्ण झाले"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s पैकी %s, %.2fKB/s येथे प्राप्त झाले, %02d:%02d:%02d अंदाजे शिल्लक वेळ"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s चे %s पाठवले, स्थानांतरन विलंब झाले, अपरिचीत उर्वरीत वेळ"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s चे %s प्राप्त झाले, स्थानांतरनास विलंब झाले, अपरिचीत वेळ बाकी"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "अपिरिचीत टक्केवारी पूर्ण. (फाइल %ld पैकी %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 अंदाजे शिल्लक वेळ. (%ld पैकी %ld फाइल)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "फाइल नावं पुनःप्राप्त करत आहे...%s बाईट्स"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "अवलोकन"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "संपादीत करा"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "दृश्य: इतर प्रक्रिया विभागू शकत नाही: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "कार्यरत कार्यक्रम: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s सह %s उघडत आहे\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s फाइलचे अवलोकन\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "अवलोकन: %s फाइल उघडणे अशक्य: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "नियंत्रण टर्मिनल %s उघडणे अशक्य\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "वापरकर्तानाव [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s आधिपासूनच अस्तित्वात आहे. (%s स्त्रोत आकार, %s लक्ष्य आकार):\n"
-"(o) खोडून लिहा, (r)पुन्हा चालू करा, (s)वगळा, (O)खोडून पुन्हा लिहा, (R)सर्व पुन्हा चालू करा, (S)सर्व वगळा: 
(%"
-"c)"
+"(o) खोडून लिहा, (r)पुन्हा चालू करा, (s)वगळा, (O)खोडून पुन्हा लिहा, (R)सर्व पुन्हा चालू "
+"करा, (S)सर्व वगळा: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  रद्द करा  "
+
+#~ msgid "Host: "
+#~ msgstr "आयोजक: "
+
+#~ msgid "User: "
+#~ msgstr "वापरकर्ता: "
+
+#~ msgid "  Close  "
+#~ msgstr "  बंद करा  "
+
+#~ msgid "Add"
+#~ msgstr "समावेष करा"
+
+#~ msgid "Cancel"
+#~ msgstr "रद्द करा"
+
+#~ msgid "  Yes  "
+#~ msgstr "  हो  "
+
+#~ msgid "  No  "
+#~ msgstr "  नाही  "
+
+#~ msgid "Type:"
+#~ msgstr "प्रकार:"
+
+#~ msgid "Network Address"
+#~ msgstr "जाळं पत्ता"
+
+#~ msgid "_Edit"
+#~ msgstr "संपादीत करा (_E)"
 
+#~ msgid "Apply"
+#~ msgstr "लागू करा"
diff --git a/po/ms.po b/po/ms.po
index bdd60a2..90409c0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: longokan\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-23 21:50-0400\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-05-04 12:47+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol ikhlas com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang lists sourceforge net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,53 +25,76 @@ msgstr "URL tak sah %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Ralat: Baris tidak sah %s pada fail indeks cache\n"
 
-#: lib/cache.c:136 lib/local.c:532
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Ralat: Tak dapat mencipta direktori '%s': %s\n"
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Ralat: Tidak dapat cipta fail sementara: %s\n"
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:289 lib/misc.c:295 lib/rfc2068.c:263 lib/sshv2.c:993
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Ralat menutup penerangan fail %s\n"
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 "Ralat: Tak dapat mencari pada fail %s: %s\n"
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr "Ralat Tidak boleh buka fail lokal %s: %s\n"
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr "Ralat: Tak dapat menulis ke soket: %s\n"
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr "Ralat: Tak dapat membaca drpd soket: %s\n"
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Ralat gFTP: Nama fail tandabuku teruk %s\n"
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Amaran: Tak dapat menjumpai fail tandabuku induk %s\n"
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Ralat gFTP: Tak dapat membuka fail tandabuku %s': %s\n"
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Amaran gFTP: Melangkah baris %d pada fail tandabuku: %s\n"
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Amaran gFTP: Baris %d tak mempunyai hujah yang cukup\n"
 
-#: lib/config_file.c:442
+#: 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 "
@@ -80,222 +104,275 @@ msgstr ""
 "proksi untuk keluar (jika ada). Sintaks: dont_use_proxy=-domain atau "
 "dont_use_proxy=rangkaian nombor/netmask"
 
-#: lib/config_file.c:445
+#: 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:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Ralat gTFP: Nama fail konfig teruk %s\n"
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Ralat gFTP: Tak dapat mencipta direktori %s: %s\n"
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Ralat gFTP: Tak menjumpai fail konfig induk %s\n"
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr "Adakah  anda ingin memasang?\n"
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Ralat gFTP: Gagal membuka fail konfig %s: %s\n"
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Amaran gFTP: Tak dapat membuka %s untuk ditulis: %s\n"
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:763
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: lib/config_file.c:845
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<entah>"
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Ralat Tidak boleh buka fail lokal %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:462
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Tak dapat menukar direktori lokal ke %s: %s\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Ralat: Tak dapat mencari pada fail %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:448
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Tak memperolehi direktori kerja semasa : %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Ralat: Ralat ketika menulis ke %s: %s\n"
 
-#: lib/local.c:179
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Ralat: Tak dapat truncate fail %s: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "Tak dapat menerima sambungan drpd pelayan: %s\n"
 
-#: lib/local.c:405
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
+#: 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 "entah"
+
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Tak dapat penyenaraian direktori lokal %s: %s\n"
 
-#: lib/local.c:442
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr ""
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
+msgstr "Berjaya mencipta direktori %s\n"
+
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Tak dapat menukar direktori lokal ke %s: %s\n"
 
-#: lib/local.c:479 lib/local.c:502 src/gtk/transfer.c:907
-#: src/gtk/view_dialog.c:301
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Berjaya dibuang %s\n"
 
-#: lib/local.c:485
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Ralat: Tak dapat membuang direktori %s: %s\n"
 
-#: lib/local.c:508 src/gtk/transfer.c:911 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Ralat: Tidak dapat membuang fail %s: %s\n"
 
-#: lib/local.c:525
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Berjaya mencipta direktori %s\n"
 
-#: lib/local.c:551
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Berjaya menukarnama %s ke %s\n"
 
-#: lib/local.c:558
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Ralat: Tak dapat menukarnama %s kepada %s:%s\n"
 
-#: lib/local.c:581
-#, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "Berjaya menukar mod bagi %s ke %d\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
 
-#: lib/local.c:588
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
-msgstr "Ralat: Tak dapat mwenukar mod bagi %s kepada %d: %s\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "Tak memperolehi direktori kerja semasa : %s\n"
 
-#: lib/local.c:680
-msgid "local filesystem"
-msgstr "Sistemfail lokal"
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr ""
 
-#: lib/misc.c:258 lib/misc.c:265 lib/protocols.c:2488
+#: lib/local.c:112
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
-msgstr "Ralat Tidak boleh buka fail lokal %s: %s\n"
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Tak dapat menukar direktori lokal ke %s: %s\n"
 
-#: lib/misc.c:275 lib/protocols.c:2206 lib/sslcommon.c:467
+#: lib/local.c:238
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
-msgstr "Ralat: Tak dapat menulis ke soket: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Ralat: Tak dapat truncate fail %s: %s\n"
 
-#: lib/misc.c:283 lib/protocols.c:2136 lib/sslcommon.c:421
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
-msgstr "Ralat: Tak dapat membaca drpd soket: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Tak dapat penyenaraian direktori lokal %s: %s\n"
 
-#: lib/misc.c:371
-#, fuzzy
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Berjaya menukar mod bagi %s ke %d\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Ralat: Tak dapat mwenukar mod bagi %s kepada %d: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Berjaya menukar mod bagi %s ke %d\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Ralat: Tak dapat mwenukar mod bagi %s kepada %d: %s\n"
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr "Sistemfail lokal"
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
 msgstr ""
-"penggunaan: gftp [[protocol://][namapengguna:[katalaluan] ]tapak[:liang][/"
-"direktori]]\n"
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "tiada"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "fail"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "saiz"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "pengguna"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "Kumpulan"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "tarikhmasa"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atribut"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "menurun"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "menaik"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Umum"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Program pelihat:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -303,424 +380,473 @@ msgstr ""
 "Program default digunakan untuk melihat fail. Jika ia kosong, pelihat "
 "dalaman akan digunakan."
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Program editor:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Program default digunakan untuk mengedit fail."
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Direktori Permulaan:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Direktori default gFTP akan pergi pada permulaan"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Saiz Tetingkap Log Maksimum:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Saiz maksimum bagi tetingkap log dalam byte bagi port GTK+"
 
-#: lib/options.h:49
+#: lib/options.h:52
 #, fuzzy
 msgid "Remote Character Sets:"
 msgstr "Direktori Jauh:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Bilangan saat untuk menunggu diantasa cubaan"
 
-#: lib/options.h:59
+#: lib/options.h:66
 #, fuzzy
 msgid "Append file transfers"
 msgstr "Pemindahan Fail"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr ""
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Lakukan satu pemindahan serentak"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Lakukan hanya satu pemindahan serentak?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Tindih secara Default"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Tindih fail secara default atau tetapkan untuk sambung pemindahan fail"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
+#: lib/options.h:80
 #, fuzzy
-msgid "Preserve file permissions of transfered files"
+msgid "Preserve file permissions of transferred files"
 msgstr "Tukar keizinan bagi fail jauh"
 
-#: lib/options.h:75
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "Pemindahan fail pasif"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "Tukar keizinan bagi fail jauh"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Segarkan selepas setiap pemindahan fail"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Segarkan kekotaksenarai selepas setiap fail dipindahkan"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Isih direktori dahulu"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Letak direktori dahulu kemudian fail"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Papar fail tersembunyi"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Papar fail tersembunyi pada kotaksenarai"
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1041
-#: src/gtk/options_dialog.c:1134
+#: lib/options.h:100
+#, fuzzy
+msgid "Show transfer status in title"
+msgstr "Lakukan satu pemindahan serentak"
+
+#: lib/options.h:102
+#, fuzzy
+msgid "Show the file transfer status in the titlebar"
+msgstr "Papar fail tersembunyi pada kotaksenarai"
+
+#: lib/options.h:103
+#, fuzzy
+msgid "Start file transfers"
+msgstr "Pemindahan fail pasif"
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Buang direktori lokal"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rangkaian"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Hadmasa rangkaian:"
 
-#: lib/options.h:94
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Hadmasa menunggu bagi input/output rangkaian. Ini adalah BUKAn hadmasa leka."
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Ulang menyambung:"
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "Bilangan auto-ulangcuba. Tetapkan ia ke 9 untuk ulangcuba selamanya"
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Masa ulang cuba:"
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Bilangan saat untuk menunggu diantasa cubaan"
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maks KB/S:"
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: lib/options.h:111
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "Pemindahan"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protokol Default:"
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ini menyatakan protokol untuk digunakan"
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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 ""
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr ""
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Lebar default bagi kekotaksenarai fail jauh"
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Tinggi default tetingkap penglogan"
 
-#: lib/options.h:135
+#: 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 ""
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Pengisihan kolum default mengikut"
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Isih menaik atau menurun"
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr ""
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Warna arahan yang diterima drpd pelayan"
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Warna bagi mesej ralat"
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Warna bagi mesej log yang lain-lain"
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 #, fuzzy
 msgid "HTTPS"
 msgstr "HTTP"
 
-#: lib/options.h:210
+#: lib/options.h:270
 msgid "Local"
 msgstr "lokal"
 
-#: lib/options.h:211
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:212 src/gtk/bookmarks.c:854
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Tanda-laman"
 
-#: lib/protocols.c:168 lib/protocols.c:192
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Pindahan fail diperlahankan ke  %.2f KB/s\n"
 
-#: lib/protocols.c:321
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Memuatkan penyenaraian direktori %s drpd cache\n"
 
-#: lib/protocols.c:466
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
+msgstr "Memuatkan penyenaraian direktori %s drpd cache\n"
+
+#: lib/protocols.c:450
+#, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Ralat: Tak dapat menulis ke cache %s\n"
 
-#: lib/protocols.c:497
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Ralat: Tidak menjumpai tandabuku %s \n"
 
-#: lib/protocols.c:504
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Ralat Tandabuku: kemasukan tandabuku %s tak mempunyai nama hos\n"
 
-#: lib/protocols.c:602
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:919 lib/protocols.c:934 lib/protocols.c:1737
-#: lib/protocols.c:1846
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Mencari %s\n"
-
-#: lib/protocols.c:925 lib/protocols.c:940 lib/protocols.c:1742
-#: lib/protocols.c:1851
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Tan menjumpai namahos %s: %s\n"
-
-#: lib/protocols.c:1184 lib/protocols.c:1185 lib/protocols.c:1244
-#: lib/protocols.c:1251 lib/protocols.c:1330 lib/protocols.c:1331
-#: lib/protocols.c:1365
-msgid "unknown"
-msgstr "entah"
-
-#: lib/protocols.c:1760 lib/protocols.c:1803 lib/rfc959.c:589 lib/rfc959.c:736
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Gagal mencipta  soket %s\n"
-
-#: lib/protocols.c:1766 lib/protocols.c:1865
+#: lib/protocols.c:1153
 #, c-format
-msgid "Trying %s:%d\n"
-msgstr "Mencuba %s:%d\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:1771 lib/protocols.c:1872
+#: lib/protocols.c:1531
 #, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Tidak boleh sambung ke %s: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgstr ""
 
-#: lib/protocols.c:1827 lib/sshv2.c:891
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:1889 lib/protocols.c:2497 lib/rfc959.c:598 lib/rfc959.c:745
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, fuzzy, c-format
 msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr "Ralat: Tak dapat mencari pada fail %s: %s\n"
 
-#: lib/protocols.c:1896
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Tersambung ke %s:%d\n"
-
-#: lib/protocols.c:2116 lib/protocols.c:2186
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Sambungan ke %s melebihi had masa\n"
-
-#: lib/protocols.c:2254
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Tak memperolehi flag soket: %s\n"
-
-#: lib/protocols.c:2268
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Tak dapat menetapkan soket ke bukan-blok: %s\n"
-
-#: lib/protocols.c:2394
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: lib/protocols.c:2402
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr ""
+#: lib/pty.c:301
+#, fuzzy, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Tidak boleh sambung ke %s: %s\n"
 
-#: lib/pty.c:271
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Tak dapat mencipta pasangan soket: %s\n"
 
-#: lib/pty.c:290 lib/pty.c:347
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Gagal melaksanakan arahan %s:\n"
 
-#: lib/pty.c:303 lib/pty.c:358
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Tak dapat sepit proses lain: %s\n"
 
-#: lib/pty.c:321
-#, fuzzy, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr "Tidak boleh sambung ke %s: %s\n"
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Namahos proksi:"
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Namahos firewall"
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Liang proksi:"
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Liang untuk disambungkan ke firewall"
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "NamaPengguna proksi:"
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Namapengguna firewall anda"
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Katalaluan proksi:"
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Katalaluan firewall anda"
 
@@ -732,88 +858,73 @@ msgstr "Guna HTTP/1.1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Adakah anda ingin menggunakan HTTP/1.1 atau HTTP/1.0"
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "Terima jawapan salah drpd pelayan, terputus\n"
 
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:988
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Putus daripada tapak%s\n"
 
-#: lib/rfc2068.c:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "Memulakan pemindahan fail pada offset %lld\n"
-
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "Memulakan pemindahan fail pada offset %ld\n"
 
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Tak dapat menerima fail %s\n"
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1073
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Menerima senarai direktori...\n"
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
-msgstr ""
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
+msgstr "Terima jawapan salah drpd pelayan, terputus\n"
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Arahan SITE"
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "pengguna hos"
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "pengguna hos:liang"
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AuTHENTIKASI"
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "pengguna hos liang"
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "pengguna hos NOAUTH"
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proksi HTTP"
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Tersendiri"
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Alamat Email:"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -821,19 +932,19 @@ msgstr ""
 "Ini adalah katalaluan yang akan digunakan bila anda logmasuk ke pelayan FTP "
 "jauh sebagai anonymous"
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Akaun proksi:"
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Akaun firewall anda (Opsyenal)"
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Jenis pelayan proksi:"
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -844,11 +955,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pemindahan fail pasif"
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -858,11 +981,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -870,80 +993,146 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Menghantar fail dalam mod ASCII"
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
-msgstr "Menerima respond tak sah pada arahan PWD : '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, fuzzy, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Gagal mencipta  soket %s\n"
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Tak menjumpai alamat IP dalam maklumbalas PASV '%s'\n"
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Tak menjumpai alamat IP dalam maklumbalas PASV '%s'\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Gagal mencipta sambuingan data: %s\n"
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Gagal mendapatkan nama soket: %s\n"
 
-#: lib/rfc959.c:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Tak dapat ikat liang: %s\n"
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Gagal dengar pada liang %d: %s\n"
 
-#: lib/rfc959.c:756
+#: lib/rfc959.c:876
+#, fuzzy, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr "Gagal mencipta  soket %s\n"
+
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Ralat: Ia nampaknya kita tidak menyambung menggunakan IPv6- Membatal "
 "sambungan.\n"
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Maklumbalas EPSV tidak sah '%s' \n"
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Tidak memperolehi alamat bagi soket lokal: %s\n"
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Tak dapat menerima sambungan drpd pelayan: %s\n"
 
-#: lib/rfc959.c:1419
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "jumlah"
 
-#: lib/rfc959.c:1421
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Amaran: tidak dapat menghantar penyenaraian %s\n"
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Mencari %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 "Tan menjumpai namahos %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Gagal mencipta  soket %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Mencuba %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 "Tidak boleh sambung ke %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Tersambung ke %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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Sambungan ke %s melebihi had masa\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Tak memperolehi flag soket: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Tak dapat menetapkan soket ke bukan-blok: %s\n"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -964,78 +1153,71 @@ msgstr "Parameter  Ekstra SSH:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parameter tambahan untuk dihantar ke program SSH"
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr "Path pelayan-sftp SSH2:"
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr "Path pelayan-sftp jauh default"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Perlu Namapengguna/Katalaluan SSH"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Memerlukan namapengguna/katalaluanuntuk sambungan SSH"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr "Guna utiliti ssh-askpass"
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "Guna utiliti ssh-askpass untuk membekalkan katalaluan jauh"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "Melaksanakan program %s\n"
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "Guna subsys SFTP SSH2"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
-"Panggil ssh dengan flag sftp -s. Ini berguna kerana anda tidak akan tau path "
-"jauh ke pelayan-sftp jauh"
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
-msgstr "Melaksanakan program %s\n"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Katalaluan:"
 
-#: lib/sshv2.c:303 lib/sshv2.c:328
-msgid "WARNING"
-msgstr "AMARAN"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Katalaluan:"
 
-#: lib/sshv2.c:370
-msgid "Error: An incorrect password was entered\n"
-msgstr "Ralat: Kesalahan katalaluan berlaku\n"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr ""
 
-#: lib/sshv2.c:373
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
-"Sila sambung ke hos ini dengan utiliti arahan baris SSH dan jawap soalan "
-"dengan betul.\n"
 
-#: lib/sshv2.c:376
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr "Sila betulkan amaran di atas untuk menyambung ke hos ini.\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+#, fuzzy
+msgid "Enter Password"
+msgstr "Katalaluan Baru"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "Katalaluan Baru"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "Ralat: Kesalahan katalaluan berlaku\n"
 
-#: lib/sshv2.c:415
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Penginitialisasian Protokol\n"
 
-#: lib/sshv2.c:421
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versi protokol %d\n"
 
-#: lib/sshv2.c:430
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Buka %s\n"
@@ -1044,134 +1226,123 @@ msgstr "%d: Buka %s\n"
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # #-#-#-#-#  ms-besar.po (besar)  #-#-#-#-#
 # libgnomeui/gnome-stock.c:840 libgnomeui/stock_demo.c:144
-#: lib/sshv2.c:435
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Tutup\n"
 
-#: lib/sshv2.c:441
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Buka Direktori %s\n"
 
-#: lib/sshv2.c:446
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Baca Direktori\n"
 
-#: lib/sshv2.c:450
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Buang fail %s\n"
 
-#: lib/sshv2.c:455
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Cipta direktori %s\n"
 
-#: lib/sshv2.c:460
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Buang direktori %s\n"
 
-#: lib/sshv2.c:465
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: lib/sshv2.c:470
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atribut fail\n"
 
-#: lib/sshv2.c:474
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: lib/sshv2.c:491
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: lib/sshv2.c:496
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:509 src/gtk/bookmarks.c:1013 src/gtk/bookmarks.c:1250
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1099
-#: src/gtk/options_dialog.c:1301 src/gtk/transfer.c:2041
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: lib/sshv2.c:512
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Tiada fail atau direktori sebegitu"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Keizinan dinafikan"
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Kegagalan"
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mesej teruk"
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Tiada sambungan"
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Sambungan hilang"
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operasi yang tidak disokong"
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Mesej takdiketahui dikembalikan drpd pelayan"
 
-#: lib/sshv2.c:573
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Ralat: Saiz mesej %d terlalu besar\n"
 
-#: lib/sshv2.c:631 lib/sshv2.c:1112 lib/sshv2.c:1949 lib/sshv2.c:2042
-#: lib/sshv2.c:2130
+#: 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 "Ralat: Saiz mesen %d terlalu besar drpd pelayan\n"
 
-#: lib/sshv2.c:637
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:710 lib/sshv2.c:723 lib/sshv2.c:745 lib/sshv2.c:813
-#: lib/sshv2.c:944 lib/sshv2.c:1035 lib/sshv2.c:1103 lib/sshv2.c:1216
-#: lib/sshv2.c:1229 lib/sshv2.c:1242 lib/sshv2.c:1255 lib/sshv2.c:1311
-#: lib/sshv2.c:1376 lib/sshv2.c:1838 lib/sshv2.c:1940 lib/sshv2.c:2033
-#: lib/sshv2.c:2118 lib/sshv2.c:2203
-msgid "Received wrong response from server, disconnecting\n"
-msgstr "Terima jawapan salah drpd pelayan, terputus\n"
-
-#: lib/sshv2.c:862
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Membuka sambungan SSH ke %s\n"
 
-#: lib/sshv2.c:955
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Berjaya logmasuk ke pelayan SSH %s\n"
@@ -1196,7 +1367,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1205,77 +1380,463 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 #, fuzzy
 msgid "Cannot get peer certificate\n"
 msgstr "Gagal mendapatkan nama soket: %s\n"
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Ralat: Tak dapat menulis ke cache %s\n"
 
-#: src/gtk/bookmarks.c:37 src/gtk/gftp-gtk.c:902 src/gtk/menu-items.c:66
-#: src/gtk/menu-items.c:96 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr "Operasi dibatalkan\n"
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Menunggu %d saat hingga cuba menyambung semula\n"
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "Diterjemahan oleh"
+
+#: 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 "Ralat: Tak disambungkan ke tapak jauh\n"
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr "penggunaan: chmod <mod> <fail>\n"
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr "penggunaan: rename <nama lama> <nama baru>\n"
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr "penggunaan: delete <fail>\n"
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr "penggunaan: rmdir <direktori>\n"
+
+#: src/uicommon/gftpui.c:363
+#, fuzzy
+msgid "usage: site <site command>\n"
+msgstr "penggunaan: delete <fail>\n"
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr "penggunaan: mkdir <direktori baru>\n"
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr "penggunaan: chdir <direktori>\n"
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr "Kosongkan cache direktori\n"
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr "penggunaan: set [pemblehubah = nilai]\n"
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+"Rakat: Pembolehubah %s adalah bukan pembolehubah konfigurasi yang sah.\n"
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr "Ralat: Pembolehubah %s tidak ada bagi port teks gFTP\n"
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+"Arahan disokong:\n"
+"\n"
+
+#: src/uicommon/gftpui.c:852
+#, fuzzy, c-format
+msgid "usage: %s <filespec>\n"
+msgstr "penggunaan: mget <filespec>\n"
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr "Perihal..."
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr "Papar maklumat gFTP"
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr "ascii"
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr "Tetapkan mod pemindahan fail ke ASCII (hanya bagi FTP)"
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr "binari"
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr "Tetapkan mod pemindahan fail ke Binari (hanya bagi FTP)"
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr "cd"
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr "Tukar direktori kerja jauh"
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr "chmod"
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr "Tukar keizinan bagi fail jauh"
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "bersihkan"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr "Opsyen yang ada: cache"
+
+# #-#-#-#-#  kejap.po (longokan)  #-#-#-#-#
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# #-#-#-#-#  ms-besar.po (besar)  #-#-#-#-#
+# libgnomeui/gnome-stock.c:840 libgnomeui/stock_demo.c:144
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr "tutup"
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr "Diputuskan daripada tapak jauh"
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr "padam"
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr "Buang fail jauh"
+
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "Chdir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "Papar senarai direktori bagi direktori jauh semasa"
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr "get"
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr "Muatturun fail(-fail) jauh"
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr "bantuan"
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr "Papar skrin bantuan ini"
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr "lcd"
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr "Tukar direktori kerja lokal"
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr "lchdir"
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr "lchmod"
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr "Tukar keizinan bagi fail lokal"
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr "ldelete"
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr "Buang fail lokal"
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr "Papar senarai direktori bagi direktori lokal semasa"
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr "lmkdir"
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr "Cipta direktori lokal"
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr "lpwd"
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr "Papar direktori lokal semasa"
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr "lrename"
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr "Tukarnama fail lokal"
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr "lrmdir"
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr "Buang direktori lokal"
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr "ls"
+
+# ui/galeon.glade.h:176
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr "mget"
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr "mkdir"
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr "Cipta direktori jauh"
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr "mput"
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr "Muatnaik fail lokal"
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr "buka"
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr "Buka sambungan ke tapak jauh"
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr "put"
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr "pwd"
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr "Papar direktori jauh semasa"
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr "keluar"
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr "Keluar dari gFTP"
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr "tukarnama"
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr "tukarnama fail jauh"
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr "rmdir"
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr "Buang satu direktori jauh"
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr "tetapkan"
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"Papar konfigurasi membolehubah fail. Anda juga boleh tetapkan pembolehubah "
+"dengan set var=val"
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+#, fuzzy
+msgid "Run a site specific command"
+msgstr "Masukkan arahan spesifik-tapak"
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr "Ralat: Arahan tak dikenali\n"
+
+#: src/uicommon/gftpui.c:1304
+#, fuzzy, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Senarai Buddy berjaya dipindahkan ke pelayan"
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Melangkau fail %s pada hos %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Menghentikan pemindaha pada hos %s\n"
+
+#: src/uicommon/gftpui.c:1505
+#, fuzzy, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Tak boleh memuatkan font \"%s\"\n"
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Sila tekan butang henti dahulu sebelum melakukan apa-apa\n"
 
-#: src/gtk/bookmarks.c:38
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Laksana Tandabuku"
 
-#: src/gtk/bookmarks.c:64
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Tambah Tandabuku: Anda mesti masukkan nama bagi tandabuku\n"
 
-#: src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Tambah Tandabuku: Tak dapat menambah tandabuku %s kerana nama sebegitu sudah "
 "ada\n"
 
-#: src/gtk/bookmarks.c:128 src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Tambah TandaBuku"
 
-#: src/gtk/bookmarks.c:135
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Tambah Tandabuku: Anda mesti masukkan nama hos\n"
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1286,143 +1847,141 @@ msgstr ""
 "menu\n"
 "(cth: Linux Sites/Debian)"
 
-#: src/gtk/bookmarks.c:139
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Ingat katalaluan"
 
-#: src/gtk/bookmarks.c:465 src/gtk/bookmarks.c:475
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Tambah Tandabuku: Anda mesti masukkan nama bagi tandabuku\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Folder Baru"
 
-#: src/gtk/bookmarks.c:466
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Masukkan nama bagi folder baru untuk dicipta"
 
-#: src/gtk/bookmarks.c:476
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Fail/Item Baru..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Masukkkan nama bagi item baru untuk dicipta"
 
-#: src/gtk/bookmarks.c:549
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Anda pasti untuk memadam tandabuku \n"
 "%s dan anak-anaknya?"
 
-#: src/gtk/bookmarks.c:550
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Padan Tandabuku"
 
-#: src/gtk/bookmarks.c:577
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "TandaBuku"
 
-#: src/gtk/bookmarks.c:819 src/gtk/bookmarks.c:822
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Sunting Masukan"
 
-#: src/gtk/bookmarks.c:859
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Huraian:"
 
-#: src/gtk/bookmarks.c:874
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Namahos:"
 
-#: src/gtk/bookmarks.c:887
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Liang:"
 
-#: src/gtk/bookmarks.c:904
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtk/bookmarks.c:928
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Direktori Jauh:"
 
-#: src/gtk/bookmarks.c:941
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Direktori Lokal:"
 
-#: src/gtk/bookmarks.c:958
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Namapengguna"
 
-#: src/gtk/bookmarks.c:971
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: src/gtk/bookmarks.c:985
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Akaun:"
 
-#: src/gtk/bookmarks.c:999
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Log masuk sebagai ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1025 src/gtk/bookmarks.c:1260
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1110
-#: src/gtk/options_dialog.c:1312 src/gtk/transfer.c:2053
-msgid "  Cancel  "
-msgstr "  Batal  "
-
-#: src/gtk/bookmarks.c:1035 src/gtk/options_dialog.c:1323
-msgid "Apply"
-msgstr "Terap"
-
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # ui/galeon.glade.h:134
-#: src/gtk/bookmarks.c:1177
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/gtk/bookmarks.c:1178
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fail/tearoff"
 
-#: src/gtk/bookmarks.c:1179
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Fail/FOlder Baru..."
 
-#: src/gtk/bookmarks.c:1180
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Fail/Item Baru..."
 
-#: src/gtk/bookmarks.c:1181
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Fail/Padam"
 
-#: src/gtk/bookmarks.c:1182
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Fail/Ciri-ciri..."
 
-#: src/gtk/bookmarks.c:1183
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fail/sep"
 
-#: src/gtk/bookmarks.c:1184
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Fail/Tutup"
 
-#: src/gtk/bookmarks.c:1195 src/gtk/bookmarks.c:1198
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edit TandaBuku"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:90
-#: src/gtk/menu-items.c:430 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:533
-msgid "Operation canceled\n"
-msgstr "Operasi dibatalkan\n"
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1430,78 +1989,92 @@ msgstr ""
 "Anda kini boleh mengubah atribut fail anda\n"
 "Nota: Tak semua pelayan ftp menyokong kebolehan ini"
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Istimewa"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Lekat"
 
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # libgnomeui/gnome-scores.c:99
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:590
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Pengguna"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Baca"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Tulis"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Laksana"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:591
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Kumpulan"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Lain-lain"
 
-#: src/gtk/delete_dialog.c:157
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Anda pasti untuk memadam %ld fail dan %ld direktori ini"
 
-#: src/gtk/delete_dialog.c:159
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "Anda pasti untuk memadam %ld fail dan %ld direktori ini"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "Anda pasti untuk memadam %ld fail dan %ld direktori ini"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Padam Fail/Direktori"
 
-#: src/gtk/delete_dialog.c:177 src/gtk/options_dialog.c:1184
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Padam"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr "Heret dan Jatuh"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Sambung"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL Diterima %s\n"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "Heret dan Jatuh"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1509,333 +2082,408 @@ msgstr ""
 "Terdapat fail dipindahkan dalam progress.\n"
 "Anda pasti untuk keluar?"
 
-#: src/gtk/gftp-gtk.c:159
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# ui/galeon.glade.h:247
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# ui/galeon.glade.h:247
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# ui/galeon.glade.h:247
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# ui/galeon.glade.h:247
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Opsyen"
+
+#: src/gtk/gftp-gtk.c:217
+#, fuzzy
+msgid "Enter a URL to connect to"
+msgstr "Masukkan url ftp untuk disambungkan"
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/pengoyak"
 
-#: src/gtk/gftp-gtk.c:161
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Tetingkap 1"
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Tetingkap 2"
 
-#: src/gtk/gftp-gtk.c:163 src/gtk/gftp-gtk.c:166 src/gtk/gftp-gtk.c:169
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:164
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binari"
 
-# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
-# ui/galeon.glade.h:247
-#: src/gtk/gftp-gtk.c:167
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Optsyen..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Fail/Ciri-ciri..."
 
-#: src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Keluar"
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokal"
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokal/pengoyak"
 
-#: src/gtk/gftp-gtk.c:173
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokal/Buka _URL..."
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokal/Putus"
 
-#: src/gtk/gftp-gtk.c:175 src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokal/sep"
 
-#: src/gtk/gftp-gtk.c:176
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokal/Tukar Filespec..."
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokal/Papar yg dipilih"
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokal/Pilih Semua"
 
-#: src/gtk/gftp-gtk.c:179
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokal/Pilih Semua Fail"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokal/Nyahpilih Semua"
 
-#: src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokal/Simpan Senarai Direktori..."
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokal/Hantar Arahan SITE..."
 
-#: src/gtk/gftp-gtk.c:184
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokal/Tukar Direktori"
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Lokal/Chmod..."
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Make Directory..."
-msgstr "/Lokal/Cipta Direktori..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Fail/FOlder Baru..."
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Lokal/Tukarnama..."
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Lokal/Padam..."
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Lokal/Edit..."
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Lokal/Lihat..."
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Lokal/Segarkan"
 
-#: src/gtk/gftp-gtk.c:192
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Jauh"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Jauh/pengoyak"
 
-#: src/gtk/gftp-gtk.c:194
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Jauh/Buka _URL..."
 
-#: src/gtk/gftp-gtk.c:196
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Jauh/Putus"
 
-#: src/gtk/gftp-gtk.c:198 src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Jauh/sep"
 
-#: src/gtk/gftp-gtk.c:199
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Jauh/Tukar Filespec..."
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Jauh/Papar yg dipilih"
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Jauh/Pilih Semua"
 
-#: src/gtk/gftp-gtk.c:202
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Jauh/Pilih Semua Fail"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Jauh/Nyahpilih Semua"
 
-#: src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Jauh/Simpan Senarai Direktori..."
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Jauh/Hantar Arahan SITE..."
 
-#: src/gtk/gftp-gtk.c:207
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Jauh/Tukar Direktori"
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Jauh/Chmod..."
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Make Directory..."
-msgstr "/Jauh/Cipta Direktori..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Fail/FOlder Baru..."
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Jauh/Tukarnama..."
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Jauh/Padam..."
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Jauh/_Edit..."
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Jauh/Lihat..."
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Jauh/Segarkan"
 
-#: src/gtk/gftp-gtk.c:215
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Tanda_Buku"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Tandabuku/Pengoyak"
 
-#: src/gtk/gftp-gtk.c:217
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Tandabuku/Tambah  tandabuku"
 
-#: src/gtk/gftp-gtk.c:219
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Tandabuku/Edit tandabuku"
 
-#: src/gtk/gftp-gtk.c:220
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Tandabuku/sep"
 
-#: src/gtk/gftp-gtk.c:221
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Pemindahan"
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Pemindahan/pengoyak"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/Start Transfer"
-msgstr "/Pemindahan/Mula Pemindahan"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Pemindahan/pengoyak"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Stop Transfer"
-msgstr "/Pemindahan/Henti Pemindahan"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Pemindahan/sep"
 
-#: src/gtk/gftp-gtk.c:226 src/gtk/gftp-gtk.c:234
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Pemindahan/sep"
 
-#: src/gtk/gftp-gtk.c:227
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Pemindahan/Langkau Fail Semasa"
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Pemindahan/Buang Fail"
 
-#: src/gtk/gftp-gtk.c:230
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Pemindahan/Naik _Atas"
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Pemindahan/Turun _Bawah"
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Pemindahan/Terima Fail"
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Pemindahan/Letak Fail"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/Mengl_og"
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Menglog/pengoyak"
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Menglog/Kosongkan"
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/View log..."
-msgstr "/Menglog/Lihat log..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Lokal/Lihat..."
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Menglog/Simpan log..."
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Radas"
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Radas/pengoyak"
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Radas/Banding Tetingkap"
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Radas/Kosongkan Cache"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Bantuan"
 
-#: src/gtk/gftp-gtk.c:247
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Bantuan/Pengonyak"
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Bantuan/Perihal..."
 
-#: src/gtk/gftp-gtk.c:357
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Hos:"
 
-#: src/gtk/gftp-gtk.c:375
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Liang:"
 
-#: src/gtk/gftp-gtk.c:393
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Pengguna:"
 
-#: src/gtk/gftp-gtk.c:411
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Katalaluan: "
 
-#: src/gtk/gftp-gtk.c:588 src/gtk/gftp-gtk.c:792 src/gtk/transfer.c:1882
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Namafail"
 
@@ -1843,7 +2491,7 @@ msgstr "Namafail"
 # Saiz bra
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # Saiz bra
-#: src/gtk/gftp-gtk.c:589
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Saiz"
 
@@ -1851,111 +2499,182 @@ msgstr "Saiz"
 # libgnomeui/gnome-scores.c:105
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # libgnomeui/gnome-scores.c:105
-#: src/gtk/gftp-gtk.c:592
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Tarikh"
 
-#: src/gtk/gftp-gtk.c:593
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atribut"
 
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # libgnomeui/gnome-app-util.c:687
-#: src/gtk/gftp-gtk.c:793
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progres"
 
-#: src/gtk/gftp-gtk.c:903 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
-msgid "Connect"
-msgstr "Sambung"
-
-#: src/gtk/gftp-gtk.c:925
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Ralat: Anda mesti taip satu hos untuk disambung\n"
 
-#: src/gtk/gftp-gtk.c:1160
-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";
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "Segarkan"
+
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "Namapengguna"
+
+#: src/gtk/gtkui.c:121
+#, fuzzy
+msgid "Please enter your username for this site"
+msgstr "Sila isi kata laluan anda"
+
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+#, fuzzy
+msgid "Please enter your password for this site"
+msgstr "Sila isi kata laluan anda"
+
+#: src/gtk/gtkui.c:286
+#, fuzzy
+msgid "Operation canceled...you must enter a string\n"
+msgstr "SITE: Operasi dibatalkan... anda mesti masukkan rentetan\n"
+
+#: src/gtk/gtkui.c:332
+#, fuzzy
+msgid "Mkdir"
+msgstr "dirs"
+
+#: src/gtk/gtkui.c:335
+#, fuzzy
+msgid "Make Directory"
+msgstr "Cipta Direktori"
+
+#: src/gtk/gtkui.c:335
+#, fuzzy
+msgid "Enter name of directory to create"
+msgstr "Pengguna tidak mempunyai maklumat direktori."
+
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "Tukarnama"
+
+#: src/gtk/gtkui.c:368
+#, fuzzy, c-format
+msgid "What would you like to rename %s to?"
+msgstr "Direktori manakah yang anda ingin cari?"
+
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
+msgstr "Tapak"
+
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
+msgstr "Masukkan arahan spesifik-tapak"
+
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1162 src/text/gftp-text.c:150
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
+msgstr "Chdir"
+
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
+#, fuzzy
+msgid "Skipped"
+msgstr "Langkah"
+
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
+msgstr "Menunggu...."
+
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "Tindih"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "Sambung"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "Langkah"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "Aksi"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+#, fuzzy
+msgid "Transfer Files"
+msgstr "Pemindahan"
+
+#: src/gtk/gtkui_transfer.c:242
 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"
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
 msgstr ""
+"Fail berikut wujud pada kedua-dua komputer lokal dan jauh\n"
+"Sila pilih apa yang anda mahu lakukan"
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL"
-msgstr "BukaURL"
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
+msgstr ""
 
-#: src/gtk/menu-items.c:75 src/gtk/menu-items.c:105
-msgid "OpenURL: Operation canceled...you must enter a string\n"
-msgstr "OpenURL: Operasi dibatalkan... anda mesti masukkan rentetan\n"
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr "Langkah Fail"
 
-#: src/gtk/menu-items.c:127
-msgid "Connect via URL"
-msgstr "Sambung melalui URL"
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "Pilih Semua"
 
-#: src/gtk/menu-items.c:127
-msgid "Enter ftp url to connect to"
-msgstr "Masukkan url ftp untuk disambungkan"
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr "Nyahpilih Semua"
 
-#: src/gtk/menu-items.c:160
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Tukar Filespec: Operasi dibatalkan.. anda mesti masukkan rentetan\n"
 
-#: src/gtk/menu-items.c:197 src/gtk/menu-items.c:200
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Tukar Filespec"
 
-#: src/gtk/menu-items.c:200
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Masukkan spefisikasi fail baru"
 
-#: src/gtk/menu-items.c:228 src/gtk/menu-items.c:600 src/gtk/menu-items.c:658
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Ralat: Tidak dapat membuka %s untuk menulis: %s\n"
 
-#: src/gtk/menu-items.c:254
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Simpan Senarai Direktori"
 
-#: src/gtk/menu-items.c:371
-msgid "SITE: Operation canceled...you must enter a string\n"
-msgstr "SITE: Operasi dibatalkan... anda mesti masukkan rentetan\n"
-
-#: src/gtk/menu-items.c:390 src/gtk/menu-items.c:393
-msgid "Site"
-msgstr "Tapak"
-
-#: src/gtk/menu-items.c:393
-msgid "Enter site-specific command"
-msgstr "Masukkan arahan spesifik-tapak"
-
-#: src/gtk/menu-items.c:492 src/gtk/menu-items.c:526
-msgid "Chdir"
-msgstr "Chdir"
-
-#: src/gtk/menu-items.c:624 src/gtk/menu-items.c:682
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Ralat: Ralat ketika menulis ke %s: %s\n"
 
-#: src/gtk/menu-items.c:693
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Berjaya menulis fail log %s.\n"
 
-#: src/gtk/menu-items.c:705
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Simpan Log"
 
-#: src/gtk/menu-items.c:741
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -1964,130 +2683,100 @@ msgstr ""
 "Tak menjumpai fail lesen persetujuan COPYING. Sila pastikan ianya berada di  "
 "%s atau di %s"
 
-#: src/gtk/menu-items.c:745 src/gtk/menu-items.c:750
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Perihal gFTP"
 
-#: src/gtk/menu-items.c:781
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Hakcipta (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
 "Laman Web Rasmi: http://www.gftp.org/\n";
 "Logo oleh: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:782 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "Diterjemahan oleh"
-
-#: src/gtk/menu-items.c:793
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Perihal"
 
-#: src/gtk/menu-items.c:842
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Perjanjian lesen"
 
-# #-#-#-#-#  kejap.po (longokan)  #-#-#-#-#
-# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
-# #-#-#-#-#  ms-besar.po (besar)  #-#-#-#-#
-# libgnomeui/gnome-stock.c:840 libgnomeui/stock_demo.c:144
-#: src/gtk/menu-items.c:848 src/gtk/view_dialog.c:377
-#, fuzzy
-msgid "  Close  "
-msgstr "Tutup"
-
-#: src/gtk/menu-items.c:930
+#: src/gtk/menu-items.c:613
 #, fuzzy
 msgid "Compare Windows"
 msgstr "Tetingkap kompos"
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "Segarkan"
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "Diputuskan daripada tapak jauh"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Semua Fail"
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 #, fuzzy
 msgid "] (Cached) ["
 msgstr "Dicache"
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Tidak disambung"
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, fuzzy, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Ralat membuka modul %s': %s\n"
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Tak disambung ke tapak jauh\n"
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Kebolehan ini tak wujud bila menggunakan protokol ini\n"
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Anda mesti mempunyai satu item dipilih\n"
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, fuzzy, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 "Anda mesti ada sekurang-kurangnya satu kemasukan <locale> pada <schema>\n"
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Tukar"
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "Tukarnama"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1170
-msgid "Add"
-msgstr "Tambah"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/gtk/misc-gtk.c:1053
-#, fuzzy
-msgid "  Yes  "
-msgstr "    "
-
-#: src/gtk/misc-gtk.c:1063
-#, fuzzy
-msgid "  No  "
-msgstr "    "
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 #, fuzzy
 msgid "Getting directory listings"
 msgstr "sedang cipta direktori: %s\n"
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 #, fuzzy
 msgid "  Stop  "
 msgstr "   ke   "
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2096,62 +2785,53 @@ msgstr ""
 "Diterima %ld direktori\n"
 "dan %ld fail"
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Ralat gFTP: Tak dapat menjumpai %s pada %s atau %s\n"
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
-msgstr "Mkdir: Operasi dibatalkan... anda mesti masukkan rentetan\n"
-
-#: src/gtk/mkdir_dialog.c:100
-#, fuzzy
-msgid "Mkdir"
-msgstr "dirs"
-
-#: src/gtk/mkdir_dialog.c:104
-#, fuzzy
-msgid "Make Directory"
-msgstr "Cipta Direktori"
-
-#: src/gtk/mkdir_dialog.c:104
-#, fuzzy
-msgid "Enter name of directory to create"
-msgstr "Pengguna tidak mempunyai maklumat direktori."
-
-#: src/gtk/options_dialog.c:910
+#: src/gtk/options_dialog.c:907
 #, fuzzy
 msgid "Edit Host"
 msgstr "Edit %s"
 
-#: src/gtk/options_dialog.c:910
+#: src/gtk/options_dialog.c:907
 #, fuzzy
 msgid "Add Host"
 msgstr "Tambah ke Senarai"
 
-#: src/gtk/options_dialog.c:942 src/gtk/options_dialog.c:1033
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domain"
 
-#: src/gtk/options_dialog.c:962
+#: src/gtk/options_dialog.c:978
 #, fuzzy
-msgid "Network Address"
+msgid "_Network address:"
 msgstr "Simpan Alamat"
 
-#: src/gtk/options_dialog.c:995 src/gtk/options_dialog.c:1135
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Netmask"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Domain"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Netmask"
 
-#: src/gtk/options_dialog.c:1141
+#: src/gtk/options_dialog.c:1139
 #, fuzzy
 msgid "Local Hosts"
 msgstr "Namahost Lokal:"
 
-#: src/gtk/options_dialog.c:1177 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr "Edit"
-
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # ui/galeon.glade.h:247
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
@@ -2160,98 +2840,50 @@ msgstr "Edit"
 # ui/galeon.glade.h:247
 # #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
 # ui/galeon.glade.h:247
-#: src/gtk/options_dialog.c:1239 src/gtk/options_dialog.c:1244
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opsyen"
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr "Rename: Operasi dibatalkan... anda mesti masukkan rentetan\n"
-
-#: src/gtk/rename_dialog.c:111
-#, fuzzy, c-format
-msgid "What would you like to rename %s to?"
-msgstr "Direktori manakah yang anda ingin cari?"
-
-#: src/gtk/transfer.c:166
+#: src/gtk/transfer.c:30
 #, fuzzy
 msgid "Receiving file names..."
 msgstr "Menerima Fail daripada %s"
 
-#: src/gtk/transfer.c:282
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Menunggu %d saat hingga cuba menyambung semula\n"
-
-#: src/gtk/transfer.c:309 src/gtk/transfer.c:1285
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gtk/transfer.c:319 src/gtk/transfer.c:1179 src/gtk/transfer.c:1190
-#, fuzzy
-msgid "Enter Password"
-msgstr "Katalaluan Baru"
-
-#: src/gtk/transfer.c:320 src/gtk/transfer.c:1180 src/gtk/transfer.c:1191
-#, fuzzy
-msgid "Please enter your password for this site"
-msgstr "Sila isi kata laluan anda"
-
-#: src/gtk/transfer.c:410
-#, fuzzy
-msgid "Transfer Files"
-msgstr "Pemindahan"
-
-#: src/gtk/transfer.c:418
+#: src/gtk/transfer.c:99
 #, fuzzy
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Gagal menyambung tapak."
 
-#: src/gtk/transfer.c:645
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "Ralat: Tapak jauh terputus selepas cuba memindah fail\n"
-
-#: src/gtk/transfer.c:702
-#, fuzzy, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Tak boleh memuatkan font \"%s\"\n"
-
-#: src/gtk/transfer.c:732
-#, fuzzy, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Senarai Buddy berjaya dipindahkan ke pelayan"
-
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:1071 src/gtk/transfer.c:1157
-#: src/gtk/transfer.c:1595
-#, fuzzy
-msgid "Skipped"
-msgstr "Langkah"
-
-#: src/gtk/transfer.c:841 src/gtk/transfer.c:1133 src/gtk/transfer.c:1161
-msgid "Waiting..."
-msgstr "Menunggu...."
-
-#: src/gtk/transfer.c:984
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Ralat: Anak %d mengembalikan %d\n"
 
-#: src/gtk/transfer.c:987
+#: src/gtk/transfer.c:345
 #, fuzzy, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Berjaya menerima fail"
 
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Ralat: Anak %d mengembalikan %d\n"
+
+#: src/gtk/transfer.c:368
 #, fuzzy, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Tidak dapat maklumat pada fail '%s': %s"
 
-#: src/gtk/transfer.c:999
+#: src/gtk/transfer.c:374
 #, fuzzy, c-format
 msgid "File %s was not changed\n"
 msgstr "Fail %s tidak boleh dibaca\n"
 
-#: src/gtk/transfer.c:1007
+#: src/gtk/transfer.c:382
 #, fuzzy, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2261,498 +2893,274 @@ msgstr ""
 "\n"
 "Anda ingin menggantikannya?"
 
-#: src/gtk/transfer.c:1010
+#: src/gtk/transfer.c:385
 #, fuzzy
 msgid "Edit File"
 msgstr "Edit Profil"
 
-#: src/gtk/transfer.c:1074
+#: src/gtk/transfer.c:476
 #, fuzzy
 msgid "Finished"
 msgstr "Selesai!"
 
-#: src/gtk/transfer.c:1114
+#: src/gtk/transfer.c:734
 #, fuzzy, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Menamatkan antaramuka %s?"
-
-#: src/gtk/transfer.c:1326
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% selesai, %02d:%02d:%02d baki masa dijangka. (Fail %ld of %ld)"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Terima %s drpd %s pada %.2fKB/s, %02d:%02d:%02d baki masa dijangka"
 
-#: src/gtk/transfer.c:1354
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Terima %s drpd %s pada %.2fKB/s, %02d:%02d:%02d baki masa dijangka"
 
-#: src/gtk/transfer.c:1363
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Terima %s of %s, pemindahan tergantung, baki masa tak diketahui"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Terima %s of %s, pemindahan tergantung, baki masa tak diketahui"
 
-#: src/gtk/transfer.c:1389
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr "Menerima nama fail...%s byte"
-
-#: src/gtk/transfer.c:1467 src/gtk/transfer.c:1489 src/gtk/transfer.c:1523
-#: src/gtk/transfer.c:1563 src/gtk/transfer.c:1616 src/gtk/transfer.c:1675
-#, fuzzy
-msgid "There are no file transfers selected\n"
-msgstr "Tiada lokasi teleport yang tinggal!!"
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
 
-#: src/gtk/transfer.c:1507
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Menghentikan pemindaha pada hos %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr "%d%% selesai, %02d:%02d:%02d baki masa dijangka. (Fail %ld of %ld)"
 
-#: src/gtk/transfer.c:1548 src/gtk/transfer.c:1601
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Melangkau fail %s pada hos %s\n"
-
-#: src/gtk/transfer.c:1762 src/gtk/transfer.c:1967 src/gtk/transfer.c:2006
-msgid "Overwrite"
-msgstr "Tindih"
-
-#: src/gtk/transfer.c:1784 src/gtk/transfer.c:1977 src/gtk/transfer.c:2012
-msgid "Resume"
-msgstr "Sambung"
-
-#: src/gtk/transfer.c:1806 src/gtk/transfer.c:1972
-msgid "Skip"
-msgstr "Langkah"
-
-#: src/gtk/transfer.c:1883
-#, fuzzy
-msgid "Local Size"
-msgstr "Fail lokal"
-
-#: src/gtk/transfer.c:1884
-#, fuzzy
-msgid "Remote Size"
-msgstr "_Buang Tapak"
-
-#: src/gtk/transfer.c:1885
-msgid "Action"
-msgstr "Aksi"
-
-#: src/gtk/transfer.c:1887
-#, fuzzy
-msgid "Download Files"
-msgstr "Muatturun fail?"
+msgid "Retrieving file names...%s bytes"
+msgstr "Menerima nama fail...%s byte"
 
-#: src/gtk/transfer.c:1887
+#: 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
 #, fuzzy
-msgid "Upload Files"
-msgstr "Fail telah dimuatnaik."
-
-#: src/gtk/transfer.c:1913
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-"Fail berikut wujud pada kedua-dua komputer lokal dan jauh\n"
-"Sila pilih apa yang anda mahu lakukan"
-
-#: src/gtk/transfer.c:2018
-msgid "Skip File"
-msgstr "Langkah Fail"
-
-#: src/gtk/transfer.c:2028
-msgid "Select All"
-msgstr "Pilih Semua"
-
-#: src/gtk/transfer.c:2034
-msgid "Deselect All"
-msgstr "Nyahpilih Semua"
+msgid "There are no file transfers selected\n"
+msgstr "Tiada lokasi teleport yang tinggal!!"
 
-#: src/gtk/view_dialog.c:35
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Lihat"
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edit"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Lihat: %s adalah sebuah direktori. Tak dapat melihatnya\n"
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Edit: Anda mesti nyatakan editor pada dialog iopsyen\n"
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, fuzzy, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "%s: Authdir %s bukan direktori. Batal."
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "Edit: Anda mesti nyatakan editor pada dialog iopsyen\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Lihat: Tak dapat sepit proses lain: %s\n"
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Melaksanakan program: %s %s\n"
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Buka %s dengan %s\n"
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Melihat fail  %s\n"
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, fuzzy, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Lihat: Tak dapat buka fail %si:\n"
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr "Perihal..."
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr "Papar maklumat gFTP"
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr "ascii"
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr "Tetapkan mod pemindahan fail ke ASCII (hanya bagi FTP)"
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr "binari"
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr "Tetapkan mod pemindahan fail ke Binari (hanya bagi FTP)"
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr "cd"
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr "Tukar direktori kerja jauh"
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr "chdir"
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr "chmod"
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr "Tukar keizinan bagi fail jauh"
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr "bersihkan"
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr "Opsyen yang ada: cache"
-
-# #-#-#-#-#  kejap.po (longokan)  #-#-#-#-#
-# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
-# #-#-#-#-#  ms-besar.po (besar)  #-#-#-#-#
-# libgnomeui/gnome-stock.c:840 libgnomeui/stock_demo.c:144
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr "tutup"
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr "Diputuskan daripada tapak jauh"
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr "padam"
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr "Buang fail jauh"
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr "get"
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr "Muatturun fail(-fail) jauh"
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr "bantuan"
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr "Papar skrin bantuan ini"
-
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr "lcd"
-
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr "Tukar direktori kerja lokal"
-
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr "lchdir"
-
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr "lchmod"
-
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr "Tukar keizinan bagi fail lokal"
-
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr "ldelete"
-
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr "Buang fail lokal"
-
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr "lls"
-
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr "Papar senarai direktori bagi direktori lokal semasa"
-
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr "lmkdir"
-
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr "Cipta direktori lokal"
+#: src/text/gftp-text.c:166
+#, fuzzy, c-format
+msgid "Cannot open controlling terminal %s\n"
+msgstr "Ralat gFTP: Gagal membuka fail konfig %s: %s\n"
 
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr "lpwd"
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "Namapengguna"
 
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr "Papar direktori lokal semasa"
+#: src/text/textui.c:158
+#, c-format
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+msgstr ""
 
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr "lrename"
+#, fuzzy
+#~ msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "penggunaan: gftp [[protocol://][namapengguna:[katalaluan] ]tapak[:liang][/"
+#~ "direktori]]\n"
 
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr "Tukarnama fail lokal"
+#~ msgid "Startup Directory:"
+#~ msgstr "Direktori Permulaan:"
 
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr "lrmdir"
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Direktori default gFTP akan pergi pada permulaan"
 
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr "Buang direktori lokal"
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Memulakan pemindahan fail pada offset %lld\n"
 
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr "ls"
+#~ msgid "Received invalid response to PWD command: '%s'\n"
+#~ msgstr "Menerima respond tak sah pada arahan PWD : '%s'\n"
 
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr "Papar senarai direktori bagi direktori jauh semasa"
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "Path pelayan-sftp SSH2:"
 
-# ui/galeon.glade.h:176
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr "mget"
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "Path pelayan-sftp jauh default"
 
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr "mkdir"
+#~ msgid "Use ssh-askpass utility"
+#~ msgstr "Guna utiliti ssh-askpass"
 
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr "Cipta direktori jauh"
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "Guna utiliti ssh-askpass untuk membekalkan katalaluan jauh"
 
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr "mput"
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "Guna subsys SFTP SSH2"
 
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr "Muatnaik fail lokal"
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "Panggil ssh dengan flag sftp -s. Ini berguna kerana anda tidak akan tau "
+#~ "path jauh ke pelayan-sftp jauh"
 
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr "buka"
+#~ msgid "WARNING"
+#~ msgstr "AMARAN"
 
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr "Buka sambungan ke tapak jauh"
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "Sila sambung ke hos ini dengan utiliti arahan baris SSH dan jawap soalan "
+#~ "dengan betul.\n"
 
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr "put"
+#~ msgid "Please correct the above warning to connect to this host.\n"
+#~ msgstr "Sila betulkan amaran di atas untuk menyambung ke hos ini.\n"
 
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr "pwd"
+#~ msgid "  Cancel  "
+#~ msgstr "  Batal  "
 
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr "Papar direktori jauh semasa"
+#~ msgid "Apply"
+#~ msgstr "Terap"
 
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr "keluar"
-
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr "Keluar dari gFTP"
-
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr "tukarnama"
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# ui/galeon.glade.h:247
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Optsyen..."
 
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr "tukarnama fail jauh"
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Lokal/Cipta Direktori..."
 
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr "rmdir"
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Jauh/Cipta Direktori..."
 
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr "Buang satu direktori jauh"
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Pemindahan/Mula Pemindahan"
 
-#: src/text/gftp-text.c:89
-msgid "set"
-msgstr "tetapkan"
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Pemindahan/Henti Pemindahan"
 
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
-"Papar konfigurasi membolehubah fail. Anda juga boleh tetapkan pembolehubah "
-"dengan set var=val"
+#~ msgid "/Logging/View log..."
+#~ msgstr "/Menglog/Lihat log..."
 
-#: src/text/gftp-text.c:148
-msgid ""
-">.\n"
-"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 ""
+#~ msgid "OpenURL"
+#~ msgstr "BukaURL"
 
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr "Ralat: Arahan tak dikenali\n"
+#~ msgid "OpenURL: Operation canceled...you must enter a string\n"
+#~ msgstr "OpenURL: Operasi dibatalkan... anda mesti masukkan rentetan\n"
 
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-"penggunaan: open [[ftp://][namapengguna:katalaluan tapak-]ftp[:lian][/"
-"direktori]]\n"
+#~ msgid "Connect via URL"
+#~ msgstr "Sambung melalui URL"
 
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:698
-#: src/text/gftp-text.c:716 src/text/gftp-text.c:737 src/text/gftp-text.c:811
-msgid "Error: Not connected to a remote site\n"
-msgstr "Ralat: Tak disambungkan ke tapak jauh\n"
+# #-#-#-#-#  kejap.po (longokan)  #-#-#-#-#
+# #-#-#-#-#  longgok.edited (longokan)  #-#-#-#-#
+# #-#-#-#-#  ms-besar.po (besar)  #-#-#-#-#
+# libgnomeui/gnome-stock.c:840 libgnomeui/stock_demo.c:144
+#, fuzzy
+#~ msgid "  Close  "
+#~ msgstr "Tutup"
 
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr "penggunaan: chdir <direktori>\n"
+#~ msgid "Add"
+#~ msgstr "Tambah"
 
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr "penggunaan: mkdir <direktori baru>\n"
+#~ msgid "Cancel"
+#~ msgstr "Batal"
 
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr "penggunaan: rmdir <direktori>\n"
-
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr "penggunaan: delete <fail>\n"
+#, fuzzy
+#~ msgid "  Yes  "
+#~ msgstr "    "
 
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr "penggunaan: rename <nama lama> <nama baru>\n"
+#, fuzzy
+#~ msgid "  No  "
+#~ msgstr "    "
 
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr "penggunaan: chmod <mod> <fail>\n"
+#~ msgid "Mkdir: Operation canceled...you must enter a string\n"
+#~ msgstr "Mkdir: Operasi dibatalkan... anda mesti masukkan rentetan\n"
 
-#: src/text/gftp-text.c:744
-msgid "usage: mget <filespec>\n"
-msgstr "penggunaan: mget <filespec>\n"
+#~ msgid "Rename: Operation canceled...you must enter a string\n"
+#~ msgstr "Rename: Operasi dibatalkan... anda mesti masukkan rentetan\n"
 
-#: src/text/gftp-text.c:818
-msgid "usage: mput <filespec>\n"
-msgstr "penggunaan: mput <filespec>\n"
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr "Ralat: Tapak jauh terputus selepas cuba memindah fail\n"
 
-#: src/text/gftp-text.c:956
-#, c-format
-msgid "Could not download %s\n"
-msgstr "Tak dapat muatturun %s\n"
+#, fuzzy
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Menamatkan antaramuka %s?"
 
-#: src/text/gftp-text.c:963
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr "Berjaya dipindahkan %s\n"
+#, fuzzy
+#~ msgid "Local Size"
+#~ msgstr "Fail lokal"
 
-#: src/text/gftp-text.c:1030
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-"Arahan disokong:\n"
-"\n"
+#, fuzzy
+#~ msgid "Remote Size"
+#~ msgstr "_Buang Tapak"
 
-#: src/text/gftp-text.c:1086
-msgid "usage: set [variable = value]\n"
-msgstr "penggunaan: set [pemblehubah = nilai]\n"
+#, fuzzy
+#~ msgid "Download Files"
+#~ msgstr "Muatturun fail?"
 
-#: src/text/gftp-text.c:1100
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr ""
-"Rakat: Pembolehubah %s adalah bukan pembolehubah konfigurasi yang sah.\n"
+#, fuzzy
+#~ msgid "Upload Files"
+#~ msgstr "Fail telah dimuatnaik."
 
-#: src/text/gftp-text.c:1107
-#, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr "Ralat: Pembolehubah %s tidak ada bagi port teks gFTP\n"
+#~ msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "penggunaan: open [[ftp://][namapengguna:katalaluan tapak-]ftp[:lian][/"
+#~ "direktori]]\n"
 
-#: src/text/gftp-text.c:1135
-msgid "Invalid argument\n"
-msgstr ""
+#~ msgid "usage: mput <filespec>\n"
+#~ msgstr "penggunaan: mput <filespec>\n"
 
-#: src/text/gftp-text.c:1160
-#, fuzzy, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr "Ralat gFTP: Gagal membuka fail konfig %s: %s\n"
+#~ msgid "Could not download %s\n"
+#~ msgstr "Tak dapat muatturun %s\n"
 
-#: src/text/gftp-text.c:1238
-msgid "Clear the directory cache\n"
-msgstr "Kosongkan cache direktori\n"
+#~ msgid "Successfully transferred %s\n"
+#~ msgstr "Berjaya dipindahkan %s\n"
 
 #~ msgid "Finished retrieving data\n"
 #~ msgstr "Selesai menerima data.\n"
diff --git a/po/nb.po b/po/nb.po
index 595c984..0d1e8e7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,96 +7,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gFTP 2.0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 16:37+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2008-07-09 17:22+0200\n"
 "Last-Translator: Øivind Hoel <oivind hoel gmail com>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Ugyldig URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Feil: Ugylding linje %s i indeksfil for mellomlager\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Feil: Kunne ikke opprette mappe %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Feil: Kunne ikke opprette midlertidig fil: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Feil under luking av fildeskriptor: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Feil: Kunne ikke åpne lokal fil %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, 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
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Feil: Kunne ikke åpne lokal fil %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:496
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Feil: Kunne ikke skrive til socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:449
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Feil: Kunne ikke lese fra socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP-feil: Feil i bokmerkefilnavn: %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Advarsel: Kunne ikke finne hovedfilen for bokmerker %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP-feil: Kunne ikke åpne bokmerkefil %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP-advarsel: Hopper over linje %d i bokmerkefil %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP-advarsel: Linje %d har ikke mange nok argumenter\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -107,7 +107,7 @@ msgstr ""
 "Format: dont_use_proxy=.domene eller dont_use_proxy=nettverksadress/"
 "nettverksmaske"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -115,58 +115,61 @@ msgstr ""
 "ext=filetternavn:XPM file:Ascii eller Binær (A eller B):visningsprogram. "
 "Merk: Alle argumenter bortsett fra filetternavnet er valgfrie"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP-feil: Feil i konfigurasjonsfilnavn: %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP-feil: Kunne ikke opprette mappen %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP-feil: Kunne ikke finne hovedkonfigurasjonsfilen %s \n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Kjørte du \"make install\"?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP-feil: Kunne ikke åpne konfigurasjonsfil %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Avbryter pågrunn av feil i konfigurasjonsfilen, linje %d\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP-advarsel: Hopper over linje %d i konfigurasjonsfil %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP-feil: Feil i konfigurationsfilnavn: %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP-advarsel: Kan ikke åpne %s for skriving: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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 "Bokmerkefil for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>. Advarsel: Eventuelle 
kommentarer du legger til i denne fila KOMMER TIL Å BLI OVERSKREVET."
+msgstr ""
+"Bokmerkefil for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
+"org>. Advarsel: Eventuelle kommentarer du legger til i denne fila KOMMER TIL "
+"Å BLI OVERSKREVET."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -178,215 +181,216 @@ msgstr ""
 "som f.eks står bak deg når du jobber med filen. Tidligere ble alle passord "
 "lagret som ren tekst."
 
-#: ../lib/config_file.c:845
+#: 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 "Konfigurasjonsfil for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>. Advarsel: 
Eventuelle kommentarer du legger til i denne filen SKRIVES OVER. Om en post har en «*» i kommentaren sin kan 
du ikke endre den fra gFTP"
+msgstr ""
+"Konfigurasjonsfil for gFTP. Copyright (C) 1998-2007 Brian Masney "
+"<masneyb gftp org>. Advarsel: Eventuelle kommentarer du legger til i denne "
+"filen SKRIVES OVER. Om en post har en «*» i kommentaren sin kan du ikke "
+"endre den fra gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "Kritisk gFTP-feil: Konfigurasjonsvalget \"%s\" ble ikke funnet i global "
 "hashtabell\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Feil: Kan ikke laste opp fil %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Feil: Kan ikke åpne skrive til fil %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Feil: Feil ved lukking av fil: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Korrupt filliste fra FSP-tjener %s\n"
 
-#: ../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
+#: 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 "ukjent"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, fuzzy, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Kunne ikke lese lokal katalog %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Byttet mappe til %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kunne ikke bytte mappe til %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Fjernet %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Feil: Kunne ikke fjerne mappen %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Feil: Kunne ikke fjerne fil %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Mappen %s opprettet\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s heter nå %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Feil: Kunne ikke bytte navn på %s til %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Kunne ikke bytte fjernmappe til: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Byttet lokal mappe til %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Kunne ikke bytte lokal mappe til %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Feil: Kunne ikke åpne lokal fil %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Kunne ikke lese lokal mappe %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Byttet attributter på %s til %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Feil: Kunne ikke endre attributter på %s til %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, fuzzy, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Byttet mappe til %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, fuzzy, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Feil: Kunne ikke endre attributter på %s til %o: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalt filsystem"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "bruk: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fil:"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "størrelse"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "bruker"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "gruppe"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datotid"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attributter"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "synkende"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "stigende"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Generelt"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Visningprogram:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -394,37 +398,37 @@ msgstr ""
 "Det program som brukes for å lese filer. Hvis ikke annet oppgis vil det "
 "interne visningsprogrammes bli brukt."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Redigeringsprogram:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Det program som brukes til å redigere filer."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maksimal loggvindustørrelse:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maksimal størrelse på loggvinduet i bytes (for \"GTK+\"-versjonen)"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Eksterne tegnsett:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Tjenerens LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -432,185 +436,188 @@ msgstr ""
 "Dette er verdien av LC_TIME på tjeneren, og brukes til å oppgi riktig tid i "
 "mappelistene."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Antall sekunder mellom gjenoppkoblingsforsøk"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Legg til filoverføringer"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Legg nye filoverføringer til de eksisterende."
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Gjør en overføring av gangen"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Overfør kun en fil av gangen?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Overskriv som standard"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Overskriv fil eller fortsett overføring fra slutten av fila"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Bevar filrettigheter"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Bevar filrettighetene på overførte filer"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Bevar tid for filer"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Bevar tider på filer på overførte filer"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Oppdater etter hver filoverføring"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Oppdatér mappelisten etter hver filoverføring"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Sorter mapper øverst"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Send mapper først, deretter filer"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Vis skjulte filer"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Vis skjulte filer i mappelistene"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Vis overføringsstatus i tittelen"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Vis status for overføring av filer i tittellinjen"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Start filoverføringer"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Start overføring av filer automatisk når de havner i køen?"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Tillat manuelle kommandoer i det grafiske grensesnittet"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 #, fuzzy
 msgid "Remember last directory"
 msgstr "Fjerner en lokal mappe"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 #, fuzzy
 msgid "Connect to remote server on startup"
 msgstr "Koble fra ekstern vert"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Nettverkstimeout:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Oppkoblingsforsøk:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 #, fuzzy
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "Maksimalt antall oppkoblingsforsøk. Sett til 0 for uendelig."
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tid mellom oppkoblingsforsøk"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Antall sekunder mellom gjenoppkoblingsforsøk"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Maximal båndbredde i KB/s. Sett til 0 for å koble ut."
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Blokkstørrelse for overføring:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Forvalgt protokoll:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Spesifiserer standardprotokoll"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Skru på støtte for IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -618,27 +625,27 @@ msgstr ""
 "Dette definerer hva som skjer hvis man dobbeltklikker på en fil i "
 "mappelisten. 0=Les fil, 1=Rediger fil, 2=Send fil"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Standardbredden på listen av lokale filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Standardbredden på listen av fjerne filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Høyden på lister av lokale/fjerne filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Høyden på overføringslisten hvis ikke annet oppgis"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Høyden på loggen hvis ikke annet oppgis"
 
-#: ../lib/options.h:177
+#: 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."
@@ -646,15 +653,15 @@ msgstr ""
 "Bredden på filnavnskolonner i overføringsvinduet. Hvis denne er satt til 0 "
 "kommer de til å endre størrelse automagisk."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Standardkolonne for sortering"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortér stigende eller synkende"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -663,7 +670,7 @@ msgstr ""
 "de til å endre størrelse automatisk. Hvis den er satt til -1, tas kolonnene "
 "ikke med"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -672,7 +679,7 @@ msgstr ""
 "kommer de til å endre størrelse automagisk. Hvis den er satt til -1, tas "
 "kolonnene ikke med"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -681,7 +688,7 @@ msgstr ""
 "til å endre størrelse automatisk. Hvis den er satt til -1, tas kolonnene "
 "ikke med"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -690,7 +697,7 @@ msgstr ""
 "til å endre størrelse automagisk. Hvis den er satt til -1 tas kolonnene ikke "
 "med"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -699,7 +706,7 @@ msgstr ""
 "til å endre størrelse automagisk. Hvis den er satt til -1, tas kolonnene "
 "ikke med"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -708,269 +715,269 @@ msgstr ""
 "de til å endre størrelse automagisk. Hvis den er satt til -1, tas kolonnene "
 "ikke med"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Fargen på kommandoene som sendes til tjeneren"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Fargen på kommandoene som mottas fra tjeneren"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Fargen på feilmeldingene"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Fargen på resten av loggmeldingene"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokal"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Filoverføringshastighet vil bli begrenset til %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Henter mappeliste %s fra mellomlager (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Henter mappeliste %s fra tjener (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, 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:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Feil: Kunne ikke skrive til cache: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Feil: Kunne ikke finne bokmerke %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Feil i bokmerker: Bokmerkeoppføring %s har ikke et vertsnavn\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokollen «%s» støttes ikke enda\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Feil: Vertsmaskinen %s koblet fra. Maks antall forsøk nådd... gir opp\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Feil: Vertsmaskinen %s koblet ned. Nytt forsøk om %d sekunder\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, fuzzy, c-format
 msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr "Feil: Kunne ikke åpne lokal fil %s: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Kan ikke åpne master pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Feil: Kan ikke kjøre ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Kunne ikke opprette underprosess: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxytjener:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Brannmur:"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy-port:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port for å koble til brannmuren"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxybrukernavn:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Ditt brukernavn i brannmuren"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxypassord:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ditt passord i brannmuren"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Bruk HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vil du bruke HTTP/1.1 eller HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "Mottok uventet svar fra server\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Kobler fra vertsmaskin %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 #, fuzzy
 msgid "Starting the file transfer at offset "
 msgstr "Starter filoverføringen ved posisjon %ld\n"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Kan ikke hente fil %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Henter mappeliste...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 #, fuzzy
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Mottok uventet svar fra server\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE-kommando"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "bruker vertsmaskin"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "bruker vertsmaskin:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "bruker vertsmaskin-port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "bruker vertsmaskin NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Epostadresse:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy-konto:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Din brannmurkonto (valgfritt)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Type proxyserver:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -981,11 +988,11 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr ""
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -993,11 +1000,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive filoverføringer"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1007,12 +1014,12 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 #, fuzzy
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Utvid symbolske lenker på fjernmaskinen"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1020,344 +1027,335 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Overfør filer i ASCII-modus"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ugyldig svar \"%c\" mottatt fra tjeneren.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, fuzzy, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Kunne ikke opprette dataoppkobling: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, fuzzy, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Kan ikke tilknytte port: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Kan ikke lytte på port %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, fuzzy, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, fuzzy, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, fuzzy, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kunne ikke koble til %s: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "totalt"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Advarsel: Kan ikke tolke liste %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Slår opp %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Kunne ikke slå opp hostname %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Prøver med %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Kunne ikke koble til %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Koblet til %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Tid for oppkoblingsforsøk mot %s gikk ut\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, fuzzy, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, fuzzy, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH programnavn:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Sti til SSH-programfilen"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Ekstraparametre for SSH"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Ekstra parametre for å sende til SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Trenger SSH-Brukernavn/Passord"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Krev brukernavn og passord for SSH-tilkoblinger"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Starter program: %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Oppgi passord for RSA-nøkkel"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Oppgi passord for nøkkel «"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Passord"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "passord"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nei)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Oppgi passord:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Skriv inn passord for SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Feil: Oppgitt passord er ugyldig\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Lukk\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Åpne mappen %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Les mappe\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Slett filen %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Opprett mappe %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Fjern mappe %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Filen eller mappen finnes ikke"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Feil"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Ugyldig melding"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Ingen tilkobling"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Mistet tilkobling"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Handling ikke støttet"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Tjeneren sendte en ukjent melding"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Feil: Beskjedstørrelse %d fra tjener for stor\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Feil: Beskjedstørrelse %d fra server for stor\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1365,41 +1363,41 @@ msgstr ""
 "Det oppstod en feil under oppstart av SSH-tilkobling med tjeneren. Tjeneren "
 "oppga følgende feilmelding:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Kunne ikke koble til %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Koblet til SSH-server %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr ""
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr ""
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr ""
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr ""
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1408,67 +1406,57 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 #, fuzzy
 msgid "Cannot get peer certificate\n"
 msgstr "Kunne ikke opprette tilkobling: %s\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 "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:305
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:320
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:332
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:352 ../lib/sslcommon.c:426 ../lib/sslcommon.c:474
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:379
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:400
+#: lib/sslcommon.c:392
 #, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Feil: Kunne ikke skrive til cache: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operasjonen ble avbrutt\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Venter %d sekunder og prøver igen\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 ""
-">. Hvis du har spørsmål, kommentarer eller forslag til dette programmet må "
-"du gjerne sende dem til meg på mail. Du kan alltid finne de siste nyhetene "
-"om gFTP på min webside: http://www.gftp.org\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 "
@@ -1478,76 +1466,76 @@ msgstr ""
 "er gratis programvare, og du står fritt til å distribuere den videre med "
 "visse forbehold; for detaljer se COPYING-filen.\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Oversatt av\n"
 "Anders Henriksen <anders henrix no>\n"
 "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../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 "Feil: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "bruk: chmod <modus> <fil>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "bruk: rename <gammelt navn> <nytt navn>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "bruk: delete <fil>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "bruk: rmdir <mappe>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "bruk: site <kommando>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "bruk: mkdir <ny mappe>\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 "bruk: chdir <mappe>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Ugyldig argument\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "bruk: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "bruk: set[variabel = verdi]\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 "Feil: Variabelen %s er ikke en gyldig konfigurasjonsvariabel.\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 "Feil: Variabelen %s er ikke tilgjengelig i tekstutgaven av gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1555,328 +1543,327 @@ msgstr ""
 "Tilgjengelige kommandoer:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "om"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Viser informasjon om gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Setter nåværende filoverføringsmodus til tekst/ASCII (bare for FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Setter nåværende filoverføringsmodus til binær (bare for FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Endrer aktiv mappe på tjeneren"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 #, fuzzy
 msgid "Changes the permissions of a remote file"
 msgstr "Ta vare på rettighetene på overførte filer"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 #, fuzzy
 msgid "clear"
 msgstr "tøm"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "lukk"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Kobler fra tjeneren"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "slett"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Fjerner en fil på tjeneren"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 #, fuzzy
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Viser innholdsliste for valgt mappe på tjeneren"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Laster ned fil(er) fra tjeneren"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 #, fuzzy
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Viser denne hjelpeskjermen"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Bytter aktiv lokal mappe"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 #, fuzzy
 msgid "Changes the permissions of a local file"
 msgstr "Ta vare på rettighetene på overførte filer"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Fjerner en lokal fil"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Viser innholdslisten for valgt lokal mappe"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Oppretter en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Vis valgt lokal mappe"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Gi nytt navn til lokal fil"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Fjerner en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Oppretter ny mappe på tjeneren"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Laster opp lokal(e) fil(er)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "åpne"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Kobler til en tjener"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Vis valgt mappe på tjeneren"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "avslutt"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Avslutt gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "Bytt navn"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Gi nytt navn til fil på tjeneren"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Fjern en mappe på tjeneren"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 #, fuzzy
 msgid "site"
 msgstr "størrelse"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "Skriv inn vertsmaskinspesifikk kommando"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Feil: Ukjent kommando\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, fuzzy, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Overførte %s ved %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Hopper over %s på vertsmaskin %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Stopper overføringen til/fra vertsmaskin %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Kunne ikke laste ned %s fra %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Trykk på stoppknappen før du gjør noe annet\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Åpne bokmerke"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Legg til bokmerke: Du må skrive inn et navn på bokmerket\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Legge til bokmerke: Kan ikke legge til %s fordi bokmerket allerede finnes\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Legg til bokmerke: Du må skrive inn et vertsmaskinnavn\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1886,33 +1873,33 @@ msgstr ""
 "Du kan legge det inn i en undermeny med hjelp av /\n"
 "(F.eks. Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Husk passord"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 #, fuzzy
 msgid "You must specify a name for the bookmark."
 msgstr "Legg til bokmerke: Du må skrive inn et navn på bokmerket\n"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Skriv inn navnet på den nye mappa"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 #, fuzzy
 msgid "New Item"
 msgstr "/Fil/Ny oppføring"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Skriv inn navnet på den nye oppføringen"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1921,111 +1908,104 @@ msgstr ""
 "Er du sikker på at du vil fjerne bokmerket\n"
 "%s og dets innhold?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Slett bokmerke"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Rediger post"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Vertsmaskinnavn:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Fjernmappe:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokalmappe:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Logg inn som ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Avbryt  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fil/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 #, fuzzy
 msgid "/File/New _Folder..."
 msgstr "/Fil/Ny mappe..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 #, fuzzy
 msgid "/File/New _Item..."
 msgstr "/Fil/Ny oppføring"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 #, fuzzy
 msgid "/File/_Delete"
 msgstr "/Fil/Slett"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 #, fuzzy
 msgid "/File/_Properties..."
 msgstr "/Fil/Egenskaper"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fil/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 #, fuzzy
 msgid "/File/_Close"
 msgstr "/Fil/Lukk"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Rediger bokmerker"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2033,91 +2013,90 @@ msgstr ""
 "Du kan nå justere attributtene på filene dine\n"
 "Merk: ikke alle FTP-servere støtter attributendring"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Spesielt"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Bruker"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Les"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Skriv"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Kjør"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Andre"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Er du sikker på at du vil fjerne disse %ld filene og %ld mappene?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Er du sikker på at du vil fjerne disse %ld filene?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Er du sikker på at du vil fjerne disse %ld mappene?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Slett filer/mapper"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Koble til"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Mottok URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Dra og slipp"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Avslutt"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2125,522 +2104,509 @@ msgstr ""
 "Filoverføring(er) pågår.\n"
 "Er du sikker på at du vil avslutte?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 #, fuzzy
 msgid "Open Location"
 msgstr "Alternativer"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Oppgi en URL å koble til"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 #, fuzzy
 msgid "/FTP/Window _1"
 msgstr "/FTP/Vindu 1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 #, fuzzy
 msgid "/FTP/Window _2"
 msgstr "/FTP/Vindu 2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 #, fuzzy
 msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii-overføring"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 #, fuzzy
 msgid "/FTP/_Binary"
 msgstr "/FTP/Binær overføring"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 #, fuzzy
 msgid "/FTP/_Preferences..."
 msgstr "/Fil/Egenskaper"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Avslutt"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokalt"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokalt/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 #, fuzzy
 msgid "/Local/_Open Location..."
 msgstr "/Lokalt/Åpne URL..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 #, fuzzy
 msgid "/Local/D_isconnect"
 msgstr "/Lokalt/Koble fra"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokalt/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 #, fuzzy
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokalt/Bytt filfilter..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 #, fuzzy
 msgid "/Local/_Show selected"
 msgstr "/Lokalt/Vis valgte"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 #, fuzzy
 msgid "/Local/Select _All"
 msgstr "/Lokalt/Velg alle"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokalt/Velg alle filer"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokalt/Velg bort alt"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalt/Lagre mappeliste..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalt/Send SITE-kommando"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 #, fuzzy
 msgid "/Local/_Change Directory"
 msgstr "/Lokalt/Bytt mappe"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 #, fuzzy
 msgid "/Local/_Permissions..."
 msgstr "/Lokalt/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 #, fuzzy
 msgid "/Local/_New Folder..."
 msgstr "/Fil/Ny mappe..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 #, fuzzy
 msgid "/Local/Rena_me..."
 msgstr "/Lokalt/Bytt navn..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 #, fuzzy
 msgid "/Local/_Delete..."
 msgstr "/Lokalt/Slett..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 #, fuzzy
 msgid "/Local/_Edit..."
 msgstr "/Lokalt/Rediger..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 #, fuzzy
 msgid "/Local/_View..."
 msgstr "/Lokalt/Vis..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 #, fuzzy
 msgid "/Local/_Refresh"
 msgstr "/Lokalt/Oppdater"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Eksternt"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Eksternt/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 #, fuzzy
 msgid "/Remote/_Open Location..."
 msgstr "/Eksternt/Åpne _URL..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 #, fuzzy
 msgid "/Remote/D_isconnect"
 msgstr "/Eksternt/Koble fra"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Eksternt/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 #, fuzzy
 msgid "/Remote/Change _Filespec..."
 msgstr "/Eksternt/Bytt filfilter..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
 msgid "/Remote/_Show selected"
 msgstr "/Eksternt/Vis valgte"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 #, fuzzy
 msgid "/Remote/Select _All"
 msgstr "/Eksternt/Velg alt"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Eksternt/Velg alle filer"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Eksternt/Velg bort alle"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Eksternt/Lagre mappeliste..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Eksternt/Send SITE-kommando..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 #, fuzzy
 msgid "/Remote/_Change Directory"
 msgstr "/Eksternt/Bytt mappe"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 #, fuzzy
 msgid "/Remote/_Permisssions..."
 msgstr "/Eksternt/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 #, fuzzy
 msgid "/Remote/_New Folder..."
 msgstr "/Fil/Ny mappe..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 #, fuzzy
 msgid "/Remote/Rena_me..."
 msgstr "/Eksternt/Bytt navn..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 #, fuzzy
 msgid "/Remote/_Delete..."
 msgstr "/Eksternt/Ta bort..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 #, fuzzy
 msgid "/Remote/_Edit..."
 msgstr "/Eksternt/Rediger..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 #, fuzzy
 msgid "/Remote/_View..."
 msgstr "/Eksternt/Vis..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 #, fuzzy
 msgid "/Remote/_Refresh"
 msgstr "/Eksternt/Oppdater"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bokmerker"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bokmerker/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bokmerker/Legg til bokmerke"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bokmerker/Rediger bokmerker"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bokmerker/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 #, fuzzy
 msgid "/_Transfer"
 msgstr "/_Overføringer"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 #, fuzzy
 msgid "/Transfer/tearoff"
 msgstr "/Overføringer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
 msgid "/Transfer/_Start"
 msgstr "/Overføringer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 #, fuzzy
 msgid "/Transfer/St_op"
 msgstr "/Overføringer/sep"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
 msgid "/Transfer/sep"
 msgstr "/Overføringer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
 msgid "/Transfer/Skip _Current File"
 msgstr "/Overføringer/Hopp over fil"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
 msgid "/Transfer/_Remove File"
 msgstr "/Overføringer/Fjern fil"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
 msgid "/Transfer/Move File _Up"
 msgstr "/Overføringer/Flytt fil opp"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
 msgid "/Transfer/Move File _Down"
 msgstr "/Overføringer/Flytt fil ned"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 #, fuzzy
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Overføringer/Last ned filer"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 #, fuzzy
 msgid "/Transfer/_Put Files"
 msgstr "/Overføringer/Send filer"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 #, fuzzy
 msgid "/L_og"
 msgstr "/_Logging"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 #, fuzzy
 msgid "/Log/tearoff"
 msgstr "/Logging/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 #, fuzzy
 msgid "/Log/_Clear"
 msgstr "/Logging/Tøm logg"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
 msgid "/Log/_View"
 msgstr "/Lokalt/Vis..."
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
 msgid "/Log/_Save..."
 msgstr "/Logging/Lagre logg..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Verktøy"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Verktøy/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 #, fuzzy
 msgid "/Tools/C_ompare Windows"
 msgstr "/Verktøy/Sammenlign vinduer"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 #, fuzzy
 msgid "/Tools/_Clear Cache"
 msgstr "/Verktøy/Tøm cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Hjelp"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Hjelp/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 #, fuzzy
 msgid "/Help/_About"
 msgstr "/Hjelp/Om"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Vert: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Vert: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Bruker: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "Br_uker: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Passord: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Kommando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dato"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attributter"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progresjon"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Feil: Du må skrive inn en vertsmaskin å koble opp mot\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Oppgi brukernavn"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Vennligst skriv inn ditt brukernavn for denne verten"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Vennligst skriv inn ditt passord for denne vertsmaskinen"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 #, fuzzy
 msgid "Operation canceled...you must enter a string\n"
 msgstr "SITE: Operasjonen avbrutt... Du må skrive inn en tekststreng\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Opprett mappe"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Skriv inn navnet på den nye mappen"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Hva vil du bytte navn på %s til?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Host"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Skriv inn vertsmaskinspesifikk kommando"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Hoppet over"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Legg til"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Hopp over"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Handling"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Send filer"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2648,60 +2614,60 @@ msgstr ""
 "Følgende fil(er) finnes både lokalt og på fjernmaskinen\n"
 "Hva vil du gjøre?"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Hopp over fil"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Velg bort alle"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Bytt filfilter: Operasjonen avbrutt...du må skrive inn en tekststreng\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Endre filfilter"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Skriv inn nytt filfilter"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Feil: Kan ikke åpne %s for skriving: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Lagre mappeliste"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Feil: En feil oppsto da %s skulle skrives til disk: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Loggfil lagret til %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Lagre logg"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2710,11 +2676,11 @@ msgstr ""
 "Kan ikke finne lisensavtalefilen COPYING. Vennligst kontroller at den finnes "
 "i %s eller %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Om gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -2726,98 +2692,78 @@ msgstr ""
 "Offisiell hjemmeside: http://www.gftp.org/\n";
 "Logo av: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Lukk  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Sammenlign vinduer"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Koble fra ekstern vert"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Ikke oppkoblet"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Feil ved åpning av fil %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Den funksjonen er ikke tilgjengelig i denne protokollen\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Du kan bare velge én\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Du må velge minst én\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Endre"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Legg til"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Ja  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nei "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Henter mappeliste"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " Stopp "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2826,109 +2772,89 @@ msgstr ""
 "Mottok %ld mapper\n"
 "og %ld filer"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-feil: Kan ikke finne filen %s i verken %s eller %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Rediger vertsmaskinoppføring"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Legg til vertsmaskin"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Type:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Nettverksadresse"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Nettverksadresse:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Nettverksmaske"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_ettverksmaske:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domene:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Nettverksmaske"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokale vertsmaskiner"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Utfør"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Tar imot filnavn..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Kobler opp..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Motta filer: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Feil: Underprosess %d ga returverdi %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Underprosess %d ble avsluttet normalt\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, fuzzy, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Feil: Underprosess %d ga returverdi %d\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Feil: Kan ikke få informasjon om fil %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Fil %s ble ikke endret\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2937,119 +2863,167 @@ msgstr ""
 "Fil %s har blitt endret.\n"
 "Vil du laste den opp?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Rediger fil"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, fuzzy, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Mottar %s av %s med %.2fkB/s, gjenstående tid beregnes til %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Mottar %s av %s med %.2fkB/s, gjenstående tid beregnes til %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, fuzzy, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Mottar %s av %s, men overføringen har stanset opp, gjenstående tid ukjent"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Mottar %s av %s, men overføringen har stanset opp, gjenstående tid ukjent"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Ukjent prosentandel ferdig. (Fil %ld av %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, fuzzy, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% ferdige, omtrent %02d:%02d:%02d igjen. (Fil %d av %d)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Henter filnavn... %s bytes"
 
-#: ../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
+#: 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 "Du har ikke valgt noen overføringer\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Vis"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Rediger"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Lis: %s er en mappe, og kan ikke vises.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Rediger: %s er en mappe, og kan ikke redigeres.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 "Rediger: Du må oppgi et redigeringsprogram i alternativer-dialogboksen\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Vis: Kunne ikke opprette underprosess: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Starter program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Åpner %s med %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viser filen %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Vis: Kan ikke åpne fil %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, fuzzy, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kunne ikke åpne kontrollterminal %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Brukernavn [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s finnes allerede. (%s kildestørrelse, %s målstørrelse):\n"
 "o = skriv over, r = fortsett, s = hopp over, O = skriv over alle, R = "
 "fortsett alle, S = hopp over alle: (%c)"
+
+#~ 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 ""
+#~ ">. Hvis du har spørsmål, kommentarer eller forslag til dette programmet "
+#~ "må du gjerne sende dem til meg på mail. Du kan alltid finne de siste "
+#~ "nyhetene om gFTP på min webside: http://www.gftp.org\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Avbryt  "
+
+#~ msgid "Host: "
+#~ msgstr "Vert: "
+
+#~ msgid "User: "
+#~ msgstr "Bruker: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Lukk  "
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Ja  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nei "
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Network Address"
+#~ msgstr "Nettverksadresse"
+
+#~ msgid "_Edit"
+#~ msgstr "R_ediger"
+
+#~ msgid "Apply"
+#~ msgstr "Utfør"
diff --git a/po/ne.po b/po/ne.po
index 9f20953..5d9e42a 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -15,92 +15,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.ne\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-12-07 19:52+0545\n"
 "Last-Translator: Shyam Krishna Bal <balshyam24 yahoo com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
+"Language: ne\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"
 "Plural-Forms: nplurals=2; plural=n !=1\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "अवैध यूआरएल %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr "वर्ण समूह %s बाट वर्ण समूह %s मा स्ट्रिङ '%s' बदलने क्रममा त्रुटि: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, 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:488
 #, 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:441
 #, 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 "जीएफटीपी त्रुटि: खराब पुस्तकचिनो फाइल नाम %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 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 "जीएफटीपी त्रुटि: पुस्तकचिनो फाइल %s खोल्न सकिएन: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "जीएफटीपी चेतावनी: पुस्तकचिनो फाइलमा लाइन %d फड्काइदै: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "जीएफटीपी चेतावनी: लाइन %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 "
@@ -110,7 +116,7 @@ msgstr ""
 "वाक्यबाट बाहिर निस्कन जरूरी पर्दैन।Syntax: dont_use_proxy=.domain or "
 "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"
@@ -118,52 +124,52 @@ msgstr ""
 "ext=फाइल विस्तार:XPM फाइल:Ascii वा वाइनरि (A वा B):दर्शक कार्यक्रम। द्रष्टब्य: फाइल "
 "विस्तार बाहेक सबै तर्कहरू विकल्प हुन्"
 
-#: ../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 "जीएफटीपी त्रुटि: खराब config फाइल नाम %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 "जीएफटीपी त्रुटि: डाइरेक्टरी %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 "जीएफटीपी त्रुटि: मास्टर config फाइल %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 "जीएफटीपी त्रुटि: समायोजन फाइल %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 "जीएफटीपी चेतावनी: config फाइलमा लाइन %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 "जीएफटीपी त्रुटि: खराब लग फाइल नाम %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 "जीएफटीपी चेतावनी: लेख्नका लागि %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"
@@ -171,7 +177,7 @@ msgstr ""
 "जीएफटीपीका लागि पुस्तकचिनो फाइल । सर्वाधिकार (C) १९९८-२००३ ब्राइन मास्ने "
 "<masneyb gftp 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 "
@@ -183,7 +189,7 @@ 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. "
@@ -193,209 +199,205 @@ msgstr ""
 "<masneyb gftp org>. चेतावनी: तपाईँले थप गर्नुभएको कुनै टिप्पणी अधिलेखन हुँनेछ। यदि त्यको "
 "टिप्पणीमा (*) प्रविष्ट छ भने, तपाईँले त्यो जीएफटीपी भित्र परिवर्तन गर्न सक्नु हुन्न ।"
 
-#: ../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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../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 "घातक जीएफटीपी त्रुटि: कन्फिग विकल्प '%s' विश्वव्यापी ह्यास तालीकामा फेला परेन\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "त्रुटि: फाइल %s अपलोड गर्न सकिएन\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "त्रुटि: फाइल %s मा लेख्न सकिएन: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "त्रुटि: फाइल बन्द गर्दा त्रुटि: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 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 "अज्ञात"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP डाइरेक्टरी सूची %s प्राप्त गर्न सकिएन: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "डाइरेक्टरी सफलतापूर्वक %s मा परिवर्तन भयो\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 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:304
 #, 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:308
 #, 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 "SSLसमर्थन बाट FTPS समर्थन उपलब्ध नहुँदा कम्पाइल भएका छैनन् । जडान परित्याग गर्दैछ ।\n"
+msgstr ""
+"SSLसमर्थन बाट FTPS समर्थन उपलब्ध नहुँदा कम्पाइल भएका छैनन् । जडान परित्याग गर्दैछ ।\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "SSLसमर्थन बाट HTTPS समर्थन उपलब्ध नहुँदा कम्पाइल भएका छैनन् । जडान परित्याग गर्दैछ ।\n"
+msgstr ""
+"SSLसमर्थन बाट HTTPS समर्थन उपलब्ध नहुँदा कम्पाइल भएका छैनन् । जडान परित्याग गर्दैछ ।\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "हालको काम गर्ने डाइरेक्टरी पाउन सकिएन: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "सफलतापूर्वक स्थानीय डाइरेक्टरी %s मा परिवर्तन गरियो\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 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 "त्रुटि: %s को शैली %o मा परिवर्तन हुन सकेन: %s\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 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 "त्रुटि: %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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "कुनै पनि होइन"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "फाइल"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "साइज"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "प्रयोगकर्ता"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "समूह"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "मितिसमय"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "विशेषता"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "घट्दो क्रम"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "बददो क्रम"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "साधारण"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "दृश्य कार्यक्रम:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -403,216 +405,229 @@ msgstr ""
 "पूर्वनिर्धारित कार्यक्रम फाइलहरू हेर्न प्रयोग गरिन्छ। यदि यो खाली छ भने, आन्तरिक फाइल "
 "दर्शक प्रयोग गरिन्छ"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "कार्यक्रम सम्पादन:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "फाइलहरू सम्पादन गर्न प्रयोग गरिएका पूर्वनिर्धारित कार्यक्रम ।"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "अधिक्तम लग सञ्झ्याल साइज:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ port का लागि बाइटसमा लग सञ्झ्यालको अधिकतम साइज"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "टाढाको क्यारेक्टर सेट:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 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
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "टाढाको LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 को मान हो । त्यसैले मितिलाई डाइरेक्टरी सूचीमा सही तरीकाले पद वर्णन 
गर्न सकिन्छ ।"
+msgstr ""
+"यो टाढाको साइटका लागि LC_TIME को मान हो । त्यसैले मितिलाई डाइरेक्टरी सूचीमा सही "
+"तरीकाले पद वर्णन गर्न सकिन्छ ।"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "क्यास TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "क्यास प्रविष्टिहरूको समय समाप्त हुनु अघि राख्नका लागि सेकेन्डको सङ्ख्या ।"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "फाइल स्थानान्तरण थप्नुहोस्"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "अवस्थित एउटामा नयाँ फाइल स्थानान्तरण थप्नुहोस्"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "एक समयमा एउटा स्थानान्तरण गर्नुहोस्"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "एक पटकमा एउटा मात्र स्थानान्तरण गर्नुहुन्छ?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "पूर्वनिर्धारित अनुसार अधिलेखन गर्नुहोस्"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "पूर्वनिर्धारितद्वारा फाइल अधिलेखन गर्नुहोस् वा फाइल स्थानान्तरण संक्षेपमा मिलाउनुहोस्"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "फाइल अनुमतिहरू संरक्षित गर्नुहोस्"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "स्थानान्तरण गरिएका फाइलहरूको फाइल अनुमतिहरू संरक्षित गर्नुहोस्"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "फाइल समय संरक्षित गर्नुहोस्"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "स्थानान्तरण गरिएका फाइलहरूको फाइल समय संरक्षित गर्नुहोस्"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "हरेक फाइल स्थानान्तरण पछि ताजा पार्नुहोस्"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "हरेक फाइल स्थानान्तरण पछि सूची बाकस ताजा पार्नुहोस्"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "पहिले डाइरेक्टरीहरू क्रमबद्ध गर्नुहोस्"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "पहिले डाइरेक्टरीहरू त्यसपछि फाइल राख्नुहोस्"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "लुकेका फाइलहरू देखाउनुहोस्"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "सूची बाकसहरूमा लुकेका फाइलहरू देखाउनुहोस्"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "शीर्षकमा स्थानान्तरण वस्तुस्थिति देखाउनुहोस्"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "शीर्षकपट्टीमा फाइल स्थानान्तरण वस्तुस्थिति देखाउनुहोस्"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "फाइल स्थानान्तरण सुरु गर्नुहोस्"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "फाइलहरू लाम लगाउने वित्तिकै स्थानान्तरण स्वचालित रूपमा सुरु हुन्छ"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI मा म्यानुअल आदेश अनुमति दिनुहोस्"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI (पाठ पोर्ट जस्तो प्रकार्य) मा म्यानुअल आदेशहरू प्रविष्ट गर्न अनुमति दिनुहोस्"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "अन्तिम डाइरेक्टरी सम्झनुहोस्"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "अनुप्रयोग बन्द हुँदा अन्तिम स्थानीय र टाढाको डाइरेक्टरी बचत गर्नुहोस्"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "सुरुआतमा टाढाको सर्भर जडान गर्नुहोस्"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "अनुप्रयोग सुरु हुँदा स्वचालित रूपमा टाढाको सर्भरमा जडान गर्नुहोस् ।"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "सञ्जाल"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "सञ्जाल समय समाप्त:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "सञ्जाल आगत/निर्गतका लागि प्रतिक्षा गर्दा समय समाप्ताप्त भयो। यो एउटा मन कल्पित समय समिाप्त  होइन।"
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"सञ्जाल आगत/निर्गतका लागि प्रतिक्षा गर्दा समय समाप्ताप्त भयो। यो एउटा मन कल्पित समय "
+"समिाप्त  होइन।"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "पुन:प्रयासहरू जडान गर्नुहोस्:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "स्वत पुन:कोशिस गर्नेको सङ्ख्या। यसलाई धेरै पटक पुन:कोशिस गर्न ० मा सेट गर्नुहोस्।"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "स्थिर समय पुन:प्रयास गर्नुहोस्:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "पुन:प्रयासको बीचमा पर्खनका लागि सेकेण्ड"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "अधिकतम किलो बाइट/सेकेन्ड:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "एउटा फाइल स्थानान्तरण हुनका लागि अधिकतम किलो बाइट/सेकेन्ड । (अक्षम गर्न ० मा सेट "
 "गर्नुहोस्)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "स्थानान्तर खण्ड साइज:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "खण्ड साइज फाइल स्थानान्तर गर्दा प्रयोग गरिन्छ। यो १०२४ को गुणक हुनुपर्छ।"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "पूर्वनिर्धारित प्रोटोकल:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "यसले प्रयोग गर्नलाई पूर्वनिर्धारित प्रोटोकोल निर्दिष्ट गर्दछ"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 समर्थन सक्षम पार्नुहोस्"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -620,27 +635,27 @@ msgstr ""
 "यसले फाइल सूची बाकसहरूमा तपाईँले फाइलमा दुई पटक क्लिक गर्दा के हुन्छ भनि वर्णन गर्दछ। "
 "०=दृश्य फाइल १=सम्पादन फाइल २=स्थानान्तर फाइल"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "स्थानीय फाइलहरूको सूची बाकसको पूर्वनिर्धारित चौडाइ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "टाढाका फाइलहरूको सूची बाकसको पूर्वनिर्धारित चौडाइ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "स्थानीय/टाढाका फाइलहरूको सूची बाकसको पूर्वनिर्धारित उचाइ"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "स्थानान्तर सूची बाकसको पूर्वनिर्धारित उचाइ"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "सञ्झ्याल लग गर्दाको पूर्वनिर्धारित उचाइ"
 
-#: ../lib/options.h:177
+#: 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."
@@ -648,15 +663,15 @@ msgstr ""
 "स्थानान्तर सञ्झ्यालमा फाइलनाम स्तम्भको चौडाइ। यो स्तम्भलाई स्वत: दुई स्वत: तरिकाले पुन:"
 "साइज दिन यसलाई ० मा सेट गर्नुहोस्।"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "क्रमबद्ध तरीकाले मिलाउन पूर्वनिर्धारण स्तम्भ"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "बददो क्रम वा घट्दो क्रममा क्रमबद्ध गर्नुहोस्"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -664,7 +679,7 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा फाइलनाम स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत: तरिकाले पुन:साइज दिन "
 "यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्।"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -672,7 +687,7 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा साइज स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत: तरिकाले पुन:साइज दिन "
 "यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्।"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -680,7 +695,7 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा प्रयोगकर्ता स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत: तरिकाले पुन:साइज "
 "दिन यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्।"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -688,7 +703,7 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा समूह स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत: तरिकाले पुन:साइज दिन "
 "यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -696,7 +711,7 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा मिति स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत: तरिकाले पुन:साइज दिन "
 "यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -704,80 +719,75 @@ msgstr ""
 "फाइल सूचीबाकसहरूमा गुण स्तम्भको चौडाइ छ। यो स्तम्भलाई स्वत:जादुई तरिकाले पुन:साइज दिन "
 "यसलाई ० मा सेट गर्नुहोस्। यो स्तम्भलाई अक्षम गर्न यसलाई -१ मा सेट गर्नुहोस्"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "आदेशहरूको रङ जुन सर्भरमा पठाइन्छ"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "आदेशहरूको रङ जुन सर्भरबाट प्राप्त गरिन्छ"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "त्रुटि भएका सन्देशहरूको रङ"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "लग सन्देशहरूको बाँकीको रङ"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "एफटीपी"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "एफटीपीहरू"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "एचटीटीपी"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "एचटीटीपीहरू"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "स्थानीय"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "पुस्तकचिनो"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "एफएसपी"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "फाइल स्थानान्तरण %.2f किलो बाइट/सेकेन्डमा सङ्कुचन गरिनेछ\n"
 
-#: ../lib/protocols.c:378
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME '%s' मा मिलाउदा त्रुटि भयो। '%s' को पछाडि झर्दैछ\n"
 
-#: ../lib/protocols.c:389
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "क्यासबाट डाइरेक्टरी सूची %s लोड हुँदैछ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "सर्भरबाट डाइरेक्टरी सूची %s लोड हुँदैछ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:461
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "वर्ण समूह %s बाट वर्ण समूह %s मा स्ट्रिङ '%s' बदलने क्रममा त्रुटि: %s\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -786,165 +796,108 @@ msgstr ""
 "चेतावनी: फाइल '%s' को धर्के मार्ग बन्द छ। धर्के मार्ग (%s) चालु डाइरेक्टरी (%s)सँग जोडा "
 "मिलेन\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "त्रुटि: क्यासमा लेख्न सकिएन: %s\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "त्रुटि: पुस्तकचिनो %s फेला पार्न सकिएन\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, 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:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\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:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "पुनरावृत्तिक साङ्केतिक लिङ्क %s फेला पर्यो\n"
 
-#: ../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:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "त्रुटि: टाढाको साइट %s सम्पर्क बिच्छेद भयो। अधिकतम कोशिसहरू पुगिसके...छोड्दैछ \n"
 
-#: ../lib/protocols.c:3072
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "त्रुटि: टाढाको साइट %s सम्पर्क बिच्छेद भयो। के %d दोस्रोमा पुन: जडान हुँनेछ\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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"
 msgstr "मास्टर pty %s खोल्न सकिएन: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "सकेट जोडा सिर्जना गर्न सकिएन: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "त्रुटि: ssh कार्यान्वयन गर्न सकिएन: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "अर्को प्रक्रिया फोर्क गर्न सकिएन: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "प्रोक्सी होस्टनाम:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "फायरवाल होस्टनाम"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "प्रोक्सी पोर्ट:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "फायरवालमा जडान गर्न पोर्ट"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "प्रोक्सी प्रयोगकर्ता नाम:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "तपाईँको फायरवाल प्रयोगकर्ता नाम"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "प्रोक्सी पासवर्ड:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "तपाईँको फायरवाल पासवर्ड"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "एचटीटीपी/१.१ प्रयोग गर्नुहोस्"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "तपाईँ HTTP/१.१ वा HTTP/१.० प्रयोग गर्न चाहनुहुन्छ"
 
-#: ../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"
@@ -953,83 +906,85 @@ 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"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE आदेश"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:पोर्ट"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "प्रमाणीकरण गर्नुहोस्"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host पोर्ट"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP प्रोक्सी"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "अनुकूल"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "इमेल ठेगाना:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 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
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "प्रोक्सी खाता:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "तपाईँको फायरवाल खाता (वैकल्पिक)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "प्रोक्सी सर्भर प्रकार:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1045,26 +1000,26 @@ msgstr ""
 "दोस्रो वर्ण p (प्रयोगकर्ता), p (पास), h (होस्ट), o (पोर्ट) वा l (खाता) हुनसक्छ। "
 "उदाहरणका लागि, प्रोक्सी प्रयोगकर्ता उल्लेख गर्न तपाईँले %pu मा टाइप गर्न सक्नुहुन्छ।"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ठेगाना उपेक्षा गर्नुहोस्"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"यदि यसलाई सक्रिय गर्नुभयो भने टाढाका FTP सर्भरको PASV आईपी ठेगाना क्षेत्रलाई उपेक्षा गरिन्छ र "
-"यसको सट्टामा होस्टको आईपी ठेगाना प्रयोग गरिन्छ। यो रुटरका लागि चाहिन्छ जसले PASV जवाफ "
-"पठाउनेमा बाहिरिको सट्टा भित्रि आईपी ठेगाना दिन्छ।"
+"यदि यसलाई सक्रिय गर्नुभयो भने टाढाका FTP सर्भरको PASV आईपी ठेगाना क्षेत्रलाई उपेक्षा "
+"गरिन्छ र यसको सट्टामा होस्टको आईपी ठेगाना प्रयोग गरिन्छ। यो रुटरका लागि चाहिन्छ जसले "
+"PASV जवाफ पठाउनेमा बाहिरिको सट्टा भित्रि आईपी ठेगाना दिन्छ।"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "निस्क्रिय फाइल स्थानान्तरण"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1073,35 +1028,36 @@ msgid ""
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
 msgstr ""
-"यदि यसलाई सक्रिय भयो भने टाढाको FTP सर्भरले डेटा जडानका लागि पोर्ट खोल्दछ। सामान्यतया "
-"यसलाई सक्रिय गर्नु नै राम्रो उपाय हुन्छ जबसम्म तपाईँ पुरानो FTP सर्भर, जसले आधार दिंदैन, "
-"त्यसैसंगजोडिरहनु भएको छ। यदि यो निस्क्रिय भयो भने जीएफटीपीले ग्राहक पक्षमा एउटा "
-"पोर्ट खोल्दछ र टाढाको सर्भरले यसलाई जोड्दछ।"
+"यदि यसलाई सक्रिय भयो भने टाढाको FTP सर्भरले डेटा जडानका लागि पोर्ट खोल्दछ। "
+"सामान्यतया यसलाई सक्रिय गर्नु नै राम्रो उपाय हुन्छ जबसम्म तपाईँ पुरानो FTP सर्भर, जसले "
+"आधार दिंदैन, त्यसैसंगजोडिरहनु भएको छ। यदि यो निस्क्रिय भयो भने जीएफटीपीले ग्राहक पक्षमा "
+"एउटा पोर्ट खोल्दछ र टाढाको सर्भरले यसलाई जोड्दछ।"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "टाढाको सांकेतिक सम्बन्धहरू समाधान गर्नुहोस् (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
 msgstr ""
-"टाढाको FTP सर्भरले डाइरेक्टरी सूचीमा प्रणाली सम्बन्ध समाधान गर्न कोशिस गर्नेछ । सामान्यतया "
-"यसलाई सक्रिय छाड्नु नै राम्रो उपाय हो। यदि टाढाको FTP "
-"सर्भरले LIST मा -L विकल्पलाई आधार दिंदैन भने यसलाई निस्क्रिय पार्ने मात्र समय ।"
+"टाढाको FTP सर्भरले डाइरेक्टरी सूचीमा प्रणाली सम्बन्ध समाधान गर्न कोशिस गर्नेछ । "
+"सामान्यतया यसलाई सक्रिय छाड्नु नै राम्रो उपाय हो। यदि टाढाको FTP सर्भरले LIST मा -L "
+"विकल्पलाई आधार दिंदैन भने यसलाई निस्क्रिय पार्ने मात्र समय ।"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII मोडमा फाइलहरू स्थानान्तर गर्नुहोस्"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1111,312 +1067,365 @@ msgstr ""
 "भने यसलाई बन्द गर्नु नै सुरक्षित हुन्छ। यदि तपाईँले बाइनरी डेटा डाउनलोड गर्दै हुनुहुन्छ भने "
 "तपाईँले यसलाई निस्क्रिय गर्नुपर्छ।"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "सर्भरबाट अवैध प्रतिक्रिया '%c' प्राप्त भयो।\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: 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' मा आईपी ठेगाना फेला पार्न सकिएन\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 प्रतिक्रियामा आईपी ठेगाना उपेक्षा गर्दैछ, %d.%d.%d.%d:%d मा सम्पर्क राख्दैछ\n"
+msgstr ""
+"PASV प्रतिक्रियामा आईपी ठेगाना उपेक्षा गर्दैछ, %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"
 
-#: ../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
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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/sshv2.c:28
+#: 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
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Prog नाम:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "कार्यान्वयनयोग्य SSH लाई मार्ग"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH अतिरिक्त परिमिति:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH कार्यक्रममा पास हुन अतिरिक्त परिमिति"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH प्रयोगकर्ता/पास आवश्यक छ"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH जडानका लागि प्रयोगकर्ता नाम/पासवर्डको आवश्यता पर्छ"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "कार्यक्रम %s परिचालन भइरहेको छ\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA कुञ्जीका लागि पासफ्रेज वाक्य प्रविष्ट गर्नुहोस्"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "कुञ्जीका लागि पासफ्रेज वाक्य प्रविष्ट गर्नुहोस् '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "पासवर्ड"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(हो/होइन)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE प्रविष्ट गर्नुहोस्:"
 
-#: ../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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "पासवर्ड प्रविष्ट गर्नुहोस्"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "सुरक्षित आईडी पासवर्ड प्रविष्ट गर्नुहोस्:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "त्रुटि: गलत पासवर्ड प्रविष्टि भयो\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: प्रोटोकोल प्रारम्भिकरण\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: प्रोटोकोल संस्करण %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s खोल्नुहोस्\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: बन्द गर्नुहोस्\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: डाइरेक्टरी %s खोल्नुहोस्\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: डाइरेक्टरी पढ्नुहोस्\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: फाइल %s हटाउनुहोस्\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: डाइरेक्टरी %s बनाउनुहोस्\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: डाइरेक्टरी %s हटाउनुहोस्\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: वास्तविक मार्ग %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: फाइल विशेषता\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: वस्तुस्थिति %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ठीक छ"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "त्यस्तो फाइल वा डाइरेक्टरी होइन"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "अनुमति अस्वीकार गरियो"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "असफलता"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "खराब सन्देश"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "जडान छैन"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "जडान नष्ट भयो"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "सञ्चालन असमर्थित भयो"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "सर्भरबाट अज्ञात सन्देश फर्कियो"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL इन्जिन"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL इनट्रोपि फाइल:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL इनट्रोपि फाइल"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "इनट्रोपि सीड लम्बाइ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL इन्जिनसँग सीड गर्नका लागि अधिकतम सङ्ख्यामा बाइटस्"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "समान SSL तुलना गर्नुहोस्"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1429,11 +1438,11 @@ msgstr ""
 "विषय = %s\n"
 "त्रुटि %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 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 "
@@ -1442,55 +1451,45 @@ msgstr ""
 "त्रुटि: SSL प्रमाणपत्र (%s) मा भएको होस्ट हामीले जडान गरेको (%s).होस्टसंगजोडा मिल्दैन । "
 "जडान परित्याग गर्दैछ।\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL लाइब्रेरी थालनी गर्न सकिएन\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "पूर्वनिर्धारित SSL प्रमाणपत्रहरू लोड गर्ने क्रममा त्रुटि\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 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:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "त्रुटि: SSL इन्जिन प्रारम्भ भएको छैन\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL जडान मिलाउने क्रममा त्रुटि (BIO वस्तु)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL जडान मिलाउने क्रममा त्रुटि (SSL वस्तु)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "समान प्रमाणपत्रसँग त्रुटि: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "सञ्चालन रद्द भयो\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 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/ "
-"बाट जी एफ टी पी का बारेमा भरखरैको नयाँ खबर फेला पार्न सक्नुहुन्छ।\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 "
@@ -1500,73 +1499,73 @@ msgstr ""
 "हेर्नुहोस्। यो सफ्टवेयर सित्तैमा हो , र यो कुनै निश्चित अवस्थामा पुन:वितरण गर्न तपाईँलाई "
 "स्वागत छ; विस्तृत विवरणका लागि, प्रतिलिपि फाइल हेर्नुहोस्।\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "अनुवाद"
 
-#: ../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 "उपयोग: <old name> <new name> पुन: नामकरण गर्नुहोस्\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "उपयोग:<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 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"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "उपयोग: खोल्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "उपयोग: [चल = मान] सेट गर्नुहोस्\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"
 
-#: ../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 जीएफटीपीको पाठ पोर्टमा उपलब्ध छैन\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1574,319 +1573,322 @@ msgstr ""
 "समर्थित आदेशहरू:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "उपयोग: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "बारेमा"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "जीएफटीपी जानकारी देखाउँछ"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Ascii (FTPका लागि मात्र) मा चालु फाइल फाइल स्थानान्तर मोड सेट गर्दछ"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "बाइनरी"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "बाइनरीमा चालु फाइल स्थानान्तर मोड सेट गर्यो (FTP का लागि मात्र)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "टाढा काम गर्ने डाइरेक्टरी परिवर्तन गर्दछ"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "टाढाको फाइलको अनुमतिहरू परिवर्तन गर्दछ"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "खाली गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "उपलब्ध विकल्पहरू: क्यास"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "बन्द गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "टाढाको साइटबाट जडान बिच्छेद गराउँछ ।"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "मेट्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "टाढाको फाइल हटाउँछ"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "हाल टाढाका डाइरेक्टरीका लागि डाइरेक्टरी सूची देखाउँछ ।"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "प्राप्त गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "टाढाको फाइल(हरू) डाउनलोड गर्दछ ।"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "मद्दत"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "यो मद्दत पर्दा देखाउँछ"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "स्थानीय काम गर्ने डाइरेक्टरी परिवर्तन गर्दछ"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "स्थानीय फाइलको अनुमतिहरू परिवर्तन गर्दछ"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "स्थानीय फाइल हटाउँदछ"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "हालको स्थानीय डाइरेक्टरीका लागि डाइरेक्टरी सूची देखाउँछ"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "स्थानीय डाइरेक्टरी सिर्जना गर्दछ"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "हालको स्थानीय डाइरेक्टरी देखाउनुहोस्"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "स्थानीय फाइल पुन: नामकरण गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "स्थानीय डाइरेक्टरी हटाउनुहोस्"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "टाढाको डाइरेक्टरी सिर्जना गर्दछ"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "स्थानीय फाइल(हरू) अपलोड गर्दछ"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "खोल्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "टाढाको साइटमा जडान खोल्छ"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "राख्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "हाल टाढाको डाइरेक्टरी देखाउनुहोस्"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "अन्त्य गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "जीएफटीपीबाट निस्कनुहोस्"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "पुन: नामकरण गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "टाढाको फाइल पुन: नामकरण गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "टाढाको डाइरेक्टरी हटाउनुहोस्"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "सेट गर्नुहोस्"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "कन्फिगर फाइल चलहरू देखाउनुहोस् । तपाईँले var=val सेट द्वारा पनि चलहरू सेट गर्न सक्नुहुन्छ"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"कन्फिगर फाइल चलहरू देखाउनुहोस् । तपाईँले var=val सेट द्वारा पनि चलहरू सेट गर्न सक्नुहुन्छ"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "साइट"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "साइट निर्दिष्ट आदेश चलाउनुहोस्"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 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 किलो बाइट/सेकेन्ड मा सफलतापूर्वक स्थानान्तर भयो\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 "
 "log for which items were not properly transferred."
-msgstr "त्यहाँ %d फाइल वा डाइरेक्टरीहरू छन् जुन स्थानान्तरण गर्न सकिँदैन । राम्रो सँग स्थानान्तरण नभएको 
वस्तुको लग जाँच्नुहोस् ।"
+msgstr ""
+"त्यहाँ %d फाइल वा डाइरेक्टरीहरू छन् जुन स्थानान्तरण गर्न सकिँदैन । राम्रो सँग स्थानान्तरण "
+"नभएको वस्तुको लग जाँच्नुहोस् ।"
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: केही गर्नुभन्दा पहिले कृपया 'रोक्नुहोस्' बटनमा थिच्नुहोस्\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "पुस्तकचिनो चलाउनुहोस्"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "पुस्तकचिनो थप्नुहोस्: पुस्तकचिनोका लागि तपाईँले नाम प्रविष्ट गर्नुपर्छ\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "पुस्तकचिनो थप्नुहोस्: पुस्तकचिनो %s थप्न सकिँदैन किनभने त्यो नाम पहिले नै अवस्थित छ\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "पुस्तकचिनो थप्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "पुस्तकचिनो थप्नुहोस्: तपाईँले होस्टनाम प्रविष्ट गर्नुपर्छ\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1896,31 +1898,31 @@ msgstr ""
 "तपाईँले वस्तु a बाट छुट्याउन सक्नुहुन्छ / उपमेनुमा राख्न सक्नुहुन्छ\n"
 "(ex: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "पासवर्ड सम्झनुहोस्"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "तपाईँले पुस्तकचिनोका लागि नाम निर्दिष्ट गर्नुपर्छ ।"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "नयाँ फोल्डर"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "सिर्जनाका लागि नयाँ फोल्डरको नाम प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "नयाँ वस्तु"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "सिर्जनाका लागि नयाँ वस्तुको नाम प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1929,106 +1931,99 @@ msgstr ""
 "तपाईँ साँच्चिकै पुस्तकचिनो %s र त्यसको सबै शाखाहरू मेट्नु\n"
 "चाहनुहुन्छ ?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "पुस्तकचिनो मेट्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "पुस्तकचिनोहरू"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "प्रविष्टि सम्पादन गर्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "वर्णन:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "होस्टनाम:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "पोर्ट:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "प्रोटोकल:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "टाढाको डाइरेक्टरी:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "स्थानीय डाइरेक्टरी:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "प्रयोगकर्ता नाम:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "पासवर्ड:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "खाता:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "बेनामी रूपमा लगइन गर्नुहोस्"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  रद्द गर्नुहोस्  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/File/New _Folder..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/New _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/File/_Delete"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/File/_Properties..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Close"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "पुस्तकचिनोहरू सम्पादन गर्नुहोस्"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2036,91 +2031,90 @@ msgstr ""
 "अब तपाईँले तपाईँको फाइलहरूको विशेषता समायोजन गर्न सक्नुहुन्छ\n"
 "द्रष्टब्य: सबै ftp सर्भरले chmod विशेषतालाई समर्थन गर्दैन"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "विशेष"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "टाँसिने"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "प्रयोगकर्ता"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "पढ्नुहोस्"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "लेख्नुहोस्"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "कार्यान्वयन गर्नुहोस्"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "समूह"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "अन्य"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "तपाईँ यी %ld फाइलहरू र %ld डाइरेक्टरीहरू मेट्न चाहनुहुन्छ"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "तपाईँ यी %ld फाइलहरू मेट्न चाहनुहुन्छ"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "तपाईँ यी %ld डाइरेक्टरीहरू मेट्न चाहनुहुन्छ"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "फाइलहरू/डाइरेक्टरीहरू मेट्नुहोस्"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "मेट्नुहोस्"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "जडान गर्नुहोस्"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "यूआरएल %s प्राप्त गरियो\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "तानेर छोड्नुहोस्"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "निस्कनुहोस्"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2128,468 +2122,455 @@ msgstr ""
 "त्यहाँ फाइल स्थानान्तरणहरू प्रगतिमा छ ।\n"
 "तपाईँ साँच्चिकै अन्त्य गर्न चाहनुहुन्छ ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "स्थान खोल्नुहोस्"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "यसमा जडान गर्न यूआरएल प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Window _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Window _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binary"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferences..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Quit"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_View..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remote"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remote/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remote/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remote/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remote/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remote/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remote/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remote/Select All Files"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remote/Deselect All"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remote/Save Directory Listing..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remote/Send SITE Command..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remote/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remote/_Permisssions..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remote/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remote/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remote/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remote/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remote/_View..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remote/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bookmarks/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bookmarks/Add _Bookmark"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bookmarks/Edit Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bookmarks/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transfer"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transfer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transfer/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transfer/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transfer/Skip _Current File"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transfer/_Remove File"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transfer/Move File _Up"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transfer/Move File _Down"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfer/_Retrieve Files"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transfer/_Put Files"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Clear"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_View"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Save..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/उपकरणहरू"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/उपकरणहरू/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/C_ompare Windows"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Tools/_Clear Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Help"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Help/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "होस्ट: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "होस्ट: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "पोर्ट: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "प्रयोगकर्ता: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "प्रयोगकर्ता: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "पास: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "आदेश:"
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "फाइलनाम"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "साइज"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "मिति"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "विशेषता"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "प्रगति"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "त्रुटि: तपाईँले जडान गर्नका लागि होस्टमा टाइप गर्नुपर्छ\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ताजा पार्नुहोस्"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "प्रयोगकर्ताको नाम प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "यो साइटका लागि तपाईँको प्रयोगकर्तानाम प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:586 ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "यो साइटका लागि तपाईँको पासवर्ड प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "सञ्चालन रद्द भयो...तपाईँले स्ट्रिङ प्रविष्ट गर्नुपर्छ\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "डाइरेक्टरी बनाउनुहोस्"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "सिर्जनाका लागि डाइरेक्टरीको नाम प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "पुन: नामकरण गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr " %s लाई  केमा पुन: नामकरण गर्न चाहनुहुन्छ ?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "साइट"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "साइट उल्लेख भएको आदेश प्रविष्ट गर्नुहोस्"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE सँग प्रिपेन्ड"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "अधिलेखन गर्नुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "पुन: निरन्तरता दिनुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "फड्काउनुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "कार्य"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "फाइलहरू स्थानान्तरण गर्नुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2597,71 +2578,72 @@ msgstr ""
 "निम्न फाइल(हरू) दुवै स्थानीय र टाढाको कम्प्युटरमा अवस्थित छ\n"
 "तपाईँ के गर्न चाहनुहुन्छ कृपया छान्नुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "त्रुट्टि"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "फाइल फड्काउनुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "सबै चयन गर्नुहोस्"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "सबै चयनबाट हटाउनुहोस्"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec परिवर्तन: सञ्चालन रद्द भयो...तपाईँले स्ट्रिङ प्रविष्ट गर्नु पर्दछ\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "फाइलस्पेस परिवर्तन गर्नुहोस्"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "त्रुटि: लेख्नका लागि %s खोल्न सकिएन: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "डाइरेक्टरी सूची बचत गर्नुहोस्"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "त्रुटि: %s मा लेख्दा त्रुटि: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s मा सफलतापूर्वक लग फाइल लेखियो\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "लग बचत गर्नुहोस्"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "अनुमतिपत्र सहमती फाइलको COPYING फेला परेन। कृपया यो %s वा %s मा छ भन्ने निश्चित गर्नुहोस्"
+msgstr ""
+"अनुमतिपत्र सहमती फाइलको COPYING फेला परेन। कृपया यो %s वा %s मा छ भन्ने निश्चित "
+"गर्नुहोस्"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "जीएफटीपी का बारेमा"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2672,27 +2654,23 @@ msgstr ""
 "प्रतिलिपिअधिकार (C) 1998-2007 ब्रियन मास्ने <masneyb gftp org>\n"
 "आधिकारिक गृहपृष्ठ: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "बारेमा"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "अनुमतिपत्र सम्झौता"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  बन्द गर्नुहोस्  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "सञ्झ्याल तुलना गर्नुहोस्"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "टाढाको सर्भरबाट विच्छेदन गर्नुहोस्"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2700,72 +2678,56 @@ msgstr ""
 "होस्ट प्रविष्टमा उल्लेख गरिएको साइटसँग जडान गर्नुहोस्। यदि होस्ट प्रविष्ट खाली छ भने, "
 "संवाद प्रस्तुत गरिन्छ जसले तपाईँलाई यूआरएल भित्र छिर्न अनुमति दिन्छ ।"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "सबै फाइलहरू"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (क्यास गरिएको) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "जडान छैन"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "फाइल %s खोल्ने क्रममा त्रुटि: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: टाढाको साइटमा जडान छैन\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: यो प्रोटोकोल प्रयोग गर्दा यो विशेषता उपलब्ध छैन\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: तपाईँले एउटा मात्र वस्तु चयन गरेको हुनुपर्दछ\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: तपाईँले कम्तिमा एउटा मात्र वस्तु चयन गरेको हुनुपर्दछ\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "परिवर्तन गर्नुहोस्"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "थप्नुहोस्"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "रद्द गर्नुहोस्"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  हो  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  होइन  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "डाइरेक्टरी सूची प्राप्त गर्दैछ"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  रोक्नुहोस्  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2774,109 +2736,89 @@ msgstr ""
 "%ld डाइरेक्टरीहरू\n"
 "र %ld फाइलहरू प्राप्त गरियो"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "जीएफटीपी त्रुटि: फाइल %s भित्र %s वा %s फेला परेन\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "होस्ट सम्पादन गर्नुहोस्"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "होस्ट थप्नुहोस्"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "प्रकार:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "प्रकार:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "डोमेन"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "सञ्जाल ठेगाना"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "सञ्जाल ठेगाना:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "नेटमास्क"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "नेटमास्क:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "डोमेन:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "नेटमास्क"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "स्थानीय होस्टहरू"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "सम्पादन गर्नुहोस्"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "सम्पादन"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "विकल्पहरू"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "लागू गर्नुहोस्"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 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 "जडान गर्दैछ..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "फाइलहरू पुन:प्राप्त गर्नुहोस्: टाढाको साइटमा जडान भएको छैन\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "त्रुटि:शाखा %d ले %d फिर्ता भयो\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "शाखा %d सफलतापूर्वक फर्कियो\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "त्रुटि: शाखा %d ठीक तरिकाले अन्त्य भएन\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "त्रुटि: फाइल %s का बारेमा कुनै जानकारी पाउन सकिएन: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "फाइल %s परिवर्तन भएको छैन\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2885,115 +2827,166 @@ msgstr ""
 "फाइल %s परिवर्तन भइसक्यो।\n"
 "के तपाईँ त्यसलाई अपलोड गर्न चाहनुहुन्छ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 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 "%3$.2fKB/s मा %1$s को %2$s पठाइयो, %4$02d:%5$02d:%6$02d est. बाँकी समय"
 
-#: ../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 " at %3$.2fKB/s मा %1$s को %2$s Recv , %4$02d:%5$02d:%6$02d est. बाँकी समय"
+msgstr ""
+" at %3$.2fKB/s मा %1$s को %2$s Recv , %4$02d:%5$02d:%6$02d est. बाँकी समय"
 
-#: ../src/gtk/transfer.c:773
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s को %s पठाइयो, स्थानान्तरण थाक गरियो, अज्ञात बाँकी समय"
 
-#: ../src/gtk/transfer.c:779
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %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 est. बाँकी समय । (%ld को फाइल %ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 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"
 
-#: ../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:34
+msgid "Edit"
+msgstr "सम्पादन गर्नुहोस्"
+
+#: 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:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s सँगै %s खुल्दैछ\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "फाइल %s हेर्दैछ\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "दृश्य: फाइल %s खोल्न सकिएन: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "टर्निमल नियन्त्रण गर्ने %s खोल्न सकिएन\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "प्रयोगकर्ता नाम [बेनामी]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s पहिले नै अवस्थित छ। (%s स्रोत साइज, %s गन्तव्य साइज):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%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/ बाट जी एफ टी पी का बारेमा भरखरैको नयाँ खबर फेला पार्न सक्नुहुन्छ।\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  रद्द गर्नुहोस्  "
+
+#~ msgid "Host: "
+#~ msgstr "होस्ट: "
+
+#~ msgid "User: "
+#~ msgstr "प्रयोगकर्ता: "
+
+#~ msgid "  Close  "
+#~ msgstr "  बन्द गर्नुहोस्  "
+
+#~ msgid "Add"
+#~ msgstr "थप्नुहोस्"
+
+#~ msgid "Cancel"
+#~ msgstr "रद्द गर्नुहोस्"
+
+#~ msgid "  Yes  "
+#~ msgstr "  हो  "
+
+#~ msgid "  No  "
+#~ msgstr "  होइन  "
+
+#~ msgid "Type:"
+#~ msgstr "प्रकार:"
+
+#~ msgid "Network Address"
+#~ msgstr "सञ्जाल ठेगाना"
+
+#~ msgid "_Edit"
+#~ msgstr "सम्पादन"
 
+#~ msgid "Apply"
+#~ msgstr "लागू गर्नुहोस्"
diff --git a/po/nl.po b/po/nl.po
index ecc4f9d..8f5ca9f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,90 +10,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-04 11:14+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2005-08-04 19:06+0200\n"
 "Last-Translator: Tino Meinen <a t meinen chello nl>\n"
 "Language-Team: Dutch <vertaling vrijschrift org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Ongeldige URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Fout: ongeldige regel %s in bufferindexbestand\n"
 
-#: ../lib/cache.c:137 ../lib/fsp.c:537 ../lib/local.c:477
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Fout: kan map %s niet aanmaken: %s\n"
 
-#: ../lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Fout: kan tijdelijk bestand niet aanmaken: %s\n"
 
-#: ../lib/cache.c:183 ../lib/cache.c:232 ../lib/config_file.c:157
-#: ../lib/config_file.c:163 ../lib/local.c:102 ../lib/local.c:217
-#: ../lib/rfc2068.c:259 ../lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Fout bij het sluiten van bestandsbeschrijver %s\n"
 
-#: ../lib/cache.c:250 ../lib/fsp.c:128 ../lib/fsp.c:208 ../lib/local.c:136
-#: ../lib/local.c:145 ../lib/local.c:192
+#: 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 "Fout: kan niet naar bestand %s zoeken: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3000
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Fout bij converteren van tekenreeks '%s' van karakter set %s naar karakter "
+"set %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Fout: kan lokaal bestand %s: niet openen: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2707 ../lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Fout: kan niet naar buis schrijven: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2631 ../lib/sshv2.c:364
-#: ../lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Fout: kan niet van buis lezen: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Fout: verkeerd bladwijzerbestand %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Waarschuwing: kan bladwijzerbestand %s niet vinden\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP Fout: kan bladwijzerbestand %s niet openen: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Waarschuwing: regel %d in bladwijzerbestand overgeslagen: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Waarschuwing: Regel %d heeft niet genoeg argumenten\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 "
@@ -103,7 +111,7 @@ msgstr ""
 "de proxy server (indien aanwezig) hoeven te gaan. Standaard: dont_use_proxy=."
 "domein of dont_use_proxy=netwerk nummer/netmasker"
 
-#: ../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"
@@ -111,61 +119,62 @@ msgstr ""
 "ext=bestandsextensie:XPM bestand:Ascii of Binair (A of B):weergaveprogramma. "
 "NB: Alle argumenten behalve de bestandsextensie zijn optioneel"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Fout: verkeerd configuratiebestand %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP Fout: kan map %s niet aanmaken: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP Fout: kan configuratie bestand %s niet vinden\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Is make install wel uitgevoerd?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP Fout: kan configuratiebestand %s niet openen: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Afgebroken door fouten op regel %d in configuratiebestand \n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP Waarschuwing: regel %d in configuratiebestand overgeslagen: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP Fout: verkeerd logbestand %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Waarschuwing: kan niet naar %s schrijven: %s\n"
 
-#: ../lib/config_file.c:732
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Bladwijzerbestand voor gFTP. Copyright © 1998-2003 Brian Masney "
 "<masneyb gftp org>. Waarschuwing: al het toegevoegde commentaar ZAL "
 "overschreven worden."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -177,9 +186,10 @@ msgstr ""
 "schouder meekijken, niet uw wachtwoorden zomaar kunnen lezen. Eerder werden "
 "de wachtwoorden onbeveiligd opgeslagen."
 
-#: ../lib/config_file.c:845
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -188,96 +198,99 @@ msgstr ""
 "overschreven worden. Een veld met (*) in het commentaar is niet binnen gFTP "
 "te veranderen"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:383 ../lib/protocols.c:455
-#: ../lib/protocols.c:526 ../lib/rfc2068.c:545 ../lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "FATAAL gFTP Fout: Configuratie-optie '%s' niet gevonden in algemene hash-"
 "tabel\n"
 
-#: ../lib/fsp.c:190
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Fout: kan bestand %s: niet uploaden\n"
 
-#: ../lib/fsp.c:200
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Fout: kan niet naar bestand %s schrijven: %s\n"
 
-#: ../lib/fsp.c:238
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Fout: Fout bij sluiten van bestand: %s\n"
 
-#: ../lib/fsp.c:326
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Beschadigde bestandslijst van FSP-server %s\n"
 
-#: ../lib/fsp.c:338 ../lib/fsp.c:339 ../lib/protocols.c:1541
-#: ../lib/protocols.c:1542 ../lib/protocols.c:1583 ../lib/protocols.c:1584
-#: ../lib/protocols.c:1647 ../lib/protocols.c:1654 ../lib/protocols.c:1730
-#: ../lib/protocols.c:1731 ../lib/protocols.c:1767
+#: 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 "onbekend"
 
-#: ../lib/fsp.c:376
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Kon geen FSP-bestandenlijst %s krijgen: %s\n"
 
 # Map succesvol naar %s veranderd
 # map s wordt (nu) weergegeven
-#: ../lib/fsp.c:438
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
-msgstr "Map %s wordt nu weergegeven\n\n"
+msgstr ""
+"Map %s wordt nu weergegeven\n"
+"\n"
 
-#: ../lib/fsp.c:448
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kon niet naar map %s gaan\n"
 
-#: ../lib/fsp.c:473 ../lib/fsp.c:502 ../lib/local.c:424 ../lib/local.c:447
-#: ../src/gtk/transfer.c:260 ../src/gtk/view_dialog.c:328
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s is verwijderd\n"
 
-#: ../lib/fsp.c:479 ../lib/local.c:430
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Fout: kan externe map %s niet verwijderen: %s\n"
 
-#: ../lib/fsp.c:508 ../lib/local.c:453 ../src/gtk/transfer.c:264
-#: ../src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Fout: kan extern bestand %s niet verwijderen: %s\n"
 
-#: ../lib/fsp.c:530 ../lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Map %s succesvol aangemaakt\n"
 
-#: ../lib/fsp.c:565 ../lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s is succesvol hernoemd naar %s\n"
 
-#: ../lib/fsp.c:577 ../lib/local.c:503
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Fout: kan %s niet naar %s hernoemen: %s\n"
 
-#: ../lib/ftps.c:157
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -285,7 +298,7 @@ msgstr ""
 "FTPS niet beschikbaar omdat dit programma gecompileerd is zonder SSL-"
 "ondersteuning. Verbinding wordt afgebroken.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -293,100 +306,109 @@ msgstr ""
 "HTTPS niet beschikbaar omdat dit programma gecompileerd is zonder SSL-"
 "ondersteuning. Verbinding wordt afgebroken.\n"
 
-#: ../lib/local.c:71 ../lib/local.c:407
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Kan niet naar lokale map %s gaan: %s\n"
-
-#: ../lib/local.c:85 ../lib/local.c:392
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Kan niet naar huidige map %s gaan\n"
 
-#: ../lib/local.c:183
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Map succesvol naar %s veranderd\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Kan niet naar lokale map %s gaan: %s\n"
+
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Fout: kan lokaal bestand %s niet beknotten: %s\n"
 
-#: ../lib/local.c:347
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Kan geen lijst van lokale map %s maken: %s\n"
 
-#: ../lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Map succesvol naar %s veranderd\n"
-
-#: ../lib/local.c:520
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Modus van %s succesvol veranderd naar %o\n"
 
-#: ../lib/local.c:527
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Fout: kan de modus van %s niet veranderen naar %o: %s\n"
 
-#: ../lib/local.c:623
+# Map succesvol naar %s veranderd
+# map s wordt (nu) weergegeven
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr ""
+"Map %s wordt nu weergegeven\n"
+"\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Fout: kan de modus van %s niet veranderen naar %o: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokaal bestandsysteem"
 
-#: ../lib/misc.c:401
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "gebruik: gftp "
 
-#: ../lib/misc.c:401 ../lib/rfc2068.c:303 ../src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../lib/options.h:24 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "geen"
 
-#: ../lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "bestand"
 
-#: ../lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "grootte"
 
-#: ../lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "gebruiker"
 
-#: ../lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "groep"
 
-#: ../lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datumtijd"
 
-#: ../lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "rechten"
 
-#: ../lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "aflopend"
 
-#: ../lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "oplopend"
 
-#: ../lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Algemeen"
 
-#: ../lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Weergaveprogramma:"
 
-#: ../lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -394,35 +416,27 @@ msgstr ""
 "Het standaardprogramma om bestanden weer te geven. Als dit leeg gelaten "
 "wordt, zal het interne weergaveprogramma gebruikt worden."
 
-#: ../lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Bewerkprogramma:"
 
-#: ../lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Het standaardprogramma om bestanden te bewerken."
 
-#: ../lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Opstartmap:"
-
-#: ../lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "De map die bij het opstarten van gFTP geladen wordt"
-
-#: ../lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maximale grootte van het logvenster:"
 
-#: ../lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "De maximale grootte van het logvenster in bytes voor de GTK+ port"
 
-#: ../lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Karaktersets van andere partij:"
 
-#: ../lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -430,11 +444,11 @@ msgstr ""
 "Dit is een door komma's gescheiden lijst van karaktersets van waaruit de "
 "berichten omgezet zouden kunnen worden naar de huidige locale"
 
-#: ../lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Remote LC_TIME:"
 
-#: ../lib/options.h:55
+#: lib/options.h:58
 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."
@@ -442,177 +456,200 @@ msgstr ""
 "Dit is de waarde van LC_TIME op de server op afstand. Dit is in verband met "
 "het inlezen van data in de mappenlijsten."
 
-#: ../lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Buffer TTL:"
 
-#: ../lib/options.h:60
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Het aantal seconden om buffergegevens te bewaren voordat deze verlopen."
 
-#: ../lib/options.h:63
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Toevoegen aan bestandsoverdrachten"
 
-#: ../lib/options.h:65
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Voeg nieuwe bestandsoverdrachten aan bestaande overdrachten toe"
 
-#: ../lib/options.h:66
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Een overdracht per keer"
 
-#: ../lib/options.h:68
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Verzend bestanden een voor een"
 
-#: ../lib/options.h:69
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Standaard overschrijven"
 
-#: ../lib/options.h:72
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Standaard bestanden overschrijven of instellen op hervatten van overdrachten"
 
-#: ../lib/options.h:74
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Bestandsrechten behouden"
 
-#: ../lib/options.h:77
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "De rechten behouden van verstuurde/ontvangen bestanden"
 
-#: ../lib/options.h:79
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Bestandstijd behouden"
 
-#: ../lib/options.h:82
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "De tijden behouden van verstuurde/ontvangen bestanden"
 
-#: ../lib/options.h:84
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Lijst herladen na elke bestandsoverdracht"
 
-#: ../lib/options.h:87
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Lijst herladen na elke bestandsoverdracht"
 
-#: ../lib/options.h:89
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Mappen eerst"
 
-#: ../lib/options.h:92
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "De mappen voor de bestanden"
 
-#: ../lib/options.h:93
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Verborgen bestanden tonen"
 
-#: ../lib/options.h:96
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Verborgen bestanden tonen in de lijsten"
 
-#: ../lib/options.h:97
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Overdrachtstatus in titel tonen"
 
-#: ../lib/options.h:99
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "De status van de overdracht in de venstertitel tonen"
 
-#: ../lib/options.h:100
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Begin bestandsoverdracht"
 
-#: ../lib/options.h:102
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Begin automatisch met bestandsoverdracht als bestanden in de wachtrij "
 "geplaatst worden"
 
-#: ../lib/options.h:104
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Sta handmatige commando's toe in de GUI"
 
-#: ../lib/options.h:106
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Toestaan van handmatige commando's in de GUI (functies zoals de text port)"
 
-#: ../lib/options.h:108 ../src/gtk/options_dialog.c:1023
-#: ../src/gtk/options_dialog.c:1243
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Verwijdert een lokale map"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Verbinding verbreken met de externe server"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../lib/options.h:110
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Netwerk timeout:"
 
-#: ../lib/options.h:113
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "De tijd hoe lang gewacht moet worden op netwerk invoer/uitvoer. Dit is NIET "
 "een inactief timeout."
 
-#: ../lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Aantal herverbindingen:"
 
-#: ../lib/options.h:118
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Het aantal keren opnieuw proberen. Stel in op 0 om oneindig aantal keren te "
 "proberen"
 
-#: ../lib/options.h:120
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tijd tussen herverbindingen:"
 
-#: ../lib/options.h:123
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Aantal seconden wachten tussen herverbindingen"
 
-#: ../lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/s:"
 
-#: ../lib/options.h:127
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Het maximum KB/s die een bestandsoverdracht kan krijgen. (Geef een 0 om uit "
 "te schakelen)"
 
-#: ../lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Blokgrootte overdracht:"
 
-#: ../lib/options.h:132
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "De blokgrootte welke wordt gebruikt bij bestands overdrachten. Dit zou een "
 "veelvoud van 1024 moeten zijn."
 
-#: ../lib/options.h:135
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Standaardprotocol:"
 
-#: ../lib/options.h:137
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Dit geeft het standaardprotocol aan om te gebruiken"
 
-#: ../lib/options.h:139 ../lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6-ondersteuning inschakelen"
 
-#: ../lib/options.h:147
+#: lib/options.h:159
 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"
@@ -620,27 +657,27 @@ msgstr ""
 "Dit geeft aan wat gebeurt als u op een bestand in de lijsten dubbelklikt. "
 "0=Bestand weergeven 1=Bestand bewerken 2=Bestand overdragen"
 
-#: ../lib/options.h:150
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "De standaard breedte van lokale bestanden lijst"
 
-#: ../lib/options.h:153
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "De standaard breedte van de externe bestanden lijst"
 
-#: ../lib/options.h:156
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "De standaard hoogte van de lokale/externe bestanden lijst"
 
-#: ../lib/options.h:159
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "De standaard hoogte van de overdrachtslijst"
 
-#: ../lib/options.h:162
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "De standaard hoogte van het log-venster"
 
-#: ../lib/options.h:165
+#: 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."
@@ -648,15 +685,15 @@ msgstr ""
 "De breedte van de bestandsnaam-kolom. Geef een 0 om deze kolom de breedte "
 "zelf te laten kiezen."
 
-#: ../lib/options.h:173 ../lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "De standaard kolom sorteren op"
 
-#: ../lib/options.h:176 ../lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Aflopend of oplopend sorteren"
 
-#: ../lib/options.h:186 ../lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -664,7 +701,7 @@ msgstr ""
 "De breedte van de bestandsnaam-kolom. Geef een 0 om deze kolom de breedte "
 "zelf te laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:189 ../lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -672,7 +709,7 @@ msgstr ""
 "De breedte van de bestandsgrootte-kolom. Geef een 0 om deze kolom de breedte "
 "zelf te laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:192 ../lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -680,7 +717,7 @@ msgstr ""
 "De breedte van de gebruikersnaam-kolom. Geef een 0 om deze kolom de breedte "
 "zelf te laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:195 ../lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -688,7 +725,7 @@ msgstr ""
 "De breedte van de groeps-kolom. Geef een 0 om deze kolom de breedte zelf te "
 "laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:198 ../lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -696,7 +733,7 @@ msgstr ""
 "De breedte van de datum-kolom. Geef een 0 om deze kolom de breedte zelf te "
 "laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:201 ../lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -704,264 +741,187 @@ msgstr ""
 "De breedte van de eigenschappen-kolom. Geef een 0 om deze kolom de breedte "
 "zelf te laten kiezen. Geef een -1 om deze kolom uit te zetten"
 
-#: ../lib/options.h:222
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "De kleur van de commando's die naar de server gezonden zijn"
 
-#: ../lib/options.h:225
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "De kleur van de commando's die van de server ontvangen zijn"
 
-#: ../lib/options.h:228
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "De kleur van de foutmeldingen"
 
-#: ../lib/options.h:231
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "De kleur van de overige logberichten"
 
-#: ../lib/options.h:237 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:240 ../lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:245 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:248 ../lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokaal"
 
-#: ../lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:257 ../src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bladwijzer"
 
-#: ../lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Bestandsoverdracht zal worden afgeremd tot %.2f KB/s\n"
 
-#: ../lib/protocols.c:379
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Instellen van LC_TIME op '%s' mislukt. Terugvallen op '%s'\n"
 
-#: ../lib/protocols.c:390
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Laden mappenlijst %s uit cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:400
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Laden van mappenlijst %s van server (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:454 ../lib/protocols.c:486 ../lib/protocols.c:525
-#: ../lib/protocols.c:557
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Fout bij converteren van tekenreeks '%s' van karakter set %s naar karakter "
-"set %s: %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:469
-#, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
-msgstr ""
-"Fout bij converteren van tekenreeks '%s' naar UTF-8 van huidige 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:540
-#, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr ""
-"Fout bij converteren van tekenreeks '%s' naar huidige locale van UTF-8: %s\n"
-
-#: ../lib/protocols.c:629
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "Let op: het pad wordt van het bestand '%s' gehaald. Het pad (%s) komt niet overeen met de huidige 
map (%s)\n"
+msgstr ""
+"Let op: het pad wordt van het bestand '%s' gehaald. Het pad (%s) komt niet "
+"overeen met de huidige map (%s)\n"
 
-#: ../lib/protocols.c:647
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Fout: kan niet naar buffer schrijven: %s\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Fout: kan bladwijzer %s niet vinden\n"
 
-#: ../lib/protocols.c:687
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Bladwijzerfout: de bladwijzer %s bevat geen servernaam\n"
 
-#: ../lib/protocols.c:826 ../lib/protocols.c:853
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Het '%s'-protocol wordt op dit moment niet ondersteund.\n"
 
-#: ../lib/protocols.c:1167 ../lib/protocols.c:1182 ../lib/protocols.c:2214
-#: ../lib/protocols.c:2324
-#, c-format
-msgid "Looking up %s\n"
-msgstr "%s opzoeken\n"
-
-#: ../lib/protocols.c:1173 ../lib/protocols.c:1188 ../lib/protocols.c:2219
-#: ../lib/protocols.c:2329
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Kan de hostnaam %s niet vinden: %s\n"
-
-#: ../lib/protocols.c:2237
+#: lib/protocols.c:1153
 #, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Mislukt om buis te maken: %s\n"
-
-#: ../lib/protocols.c:2243 ../lib/protocols.c:2346
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Probeer %s:%d\n"
-
-#: ../lib/protocols.c:2248 ../lib/protocols.c:2353
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Kan geen verbinding met %s maken: %s\n"
-
-#: ../lib/protocols.c:2283 ../lib/rfc959.c:640
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Kan geen IPv4-socket maken: %s\n"
-
-#: ../lib/protocols.c:2307 ../lib/sshv2.c:1046
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
-"Kan servicenaam %s/tcp niet opzoeken. Controleer alstublieft uw service-"
-"bestand\n"
-
-#: ../lib/protocols.c:2369 ../lib/protocols.c:3009 ../lib/rfc959.c:649
-#: ../lib/rfc959.c:826
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Fout: Kan exec-vlag niet sluiten: %s\n"
-
-#: ../lib/protocols.c:2376
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Verbonden met %s:%d\n"
-
-#: ../lib/protocols.c:2607 ../lib/protocols.c:2682 ../lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Verbinding naar %s timeout\n"
-
-#: ../lib/protocols.c:2750
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Kan buis opties niet verkrijgen: %s\n"
 
-#: ../lib/protocols.c:2764
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Kan buis niet op niet-blokeren zetten: %s\n"
-
-#: ../lib/protocols.c:2899
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Fout: kan niet verbinden met %s. Max herverbindingen bereikt...opgegeven\n"
 
-#: ../lib/protocols.c:2907
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Fout: externe site %s verbrak de verbinding. Herverbinding in %d seconden\n"
 
-#: ../lib/pty.c:297
+#: lib/protocols.c:1634 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 "Fout: Kan exec-vlag niet sluiten: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Kan hooft-pty %s niet openen: %s\n"
 
-#: ../lib/pty.c:305
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kan geen buizenpaar te maken: %s\n"
 
-#: ../lib/pty.c:334
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Fout: kan ssh niet uitvoeren: %s\n"
 
-#: ../lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Kan geen ander proces splitsen: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy hostnaam:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Firewall hostnaam"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy poort:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Poort om verbinding met de firewall te maken"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxy gebruikersnaam:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Firewall gebruikersnaam:"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxy wachtwoord:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Uw firewall wachtwoord"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 gebruiken"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Wilt u HTTP/1.1 of HTTP/1.0 gebruiken?"
 
-#: ../lib/rfc2068.c:150 ../lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -970,84 +930,84 @@ msgstr ""
 "Ontving verkeerd antwoord van server. Verbinding wordt verbroken\n"
 "Ongeldige deelgrootte '%s' als antwoord gekregen\n"
 
-#: ../lib/rfc2068.c:254 ../lib/rfc959.c:608 ../lib/sshv2.c:1123
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Bezig met verbinding %s te verbreken\n"
 
-#: ../lib/rfc2068.c:303
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Bestandsoverdracht gestart vanaf offset"
 
-#: ../lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Kan bestand %s niet ontvangen\n"
 
-#: ../lib/rfc2068.c:423 ../lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Bestandenlijst aan het ontvangen...\n"
 
-#: ../lib/rfc2068.c:819 ../lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Ontving verkeerd antwoord van server, verbinding wordt verbroken\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE commando"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "gebruiker host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "gebruiker host:poort"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATIE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "gebruiker host poort"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "gebruiker host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Aangepast"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-mailadres:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 "Dit wachtwoord wordt gebruikt als u zich anoniem aanmeldt op een FTP-server"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy account:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Uw firewall account (optioneel)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxyserver type:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1064,23 +1024,27 @@ msgstr ""
 "(wachtwoord), h (host) of a (account) zijn. Voorbeeld: voor de "
 "gebruikersnaam op de proxy gebruik je %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV-adres negeren"
 
-#: ../lib/rfc959.c:72
+#: 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 "Indien dit aanstaat wordt het PASV IP-adres van de FTP-server genegeerd. In plaats daarvan wordt het 
IP-adres van de host gebruikt. Dit is vaak nodig bij routers die hun interne IP-adres doorgeven in plaats van 
hun externe IP-adres in een PASV-antwoord."
+msgstr ""
+"Indien dit aanstaat wordt het PASV IP-adres van de FTP-server genegeerd. In "
+"plaats daarvan wordt het IP-adres van de host gebruikt. Dit is vaak nodig "
+"bij routers die hun interne IP-adres doorgeven in plaats van hun externe IP-"
+"adres in een PASV-antwoord."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passieve bestandsoverdrachten"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1094,11 +1058,11 @@ msgstr ""
 "optie is over het algemeen goed om altijd ingeschakeld te hebben, tenzij u "
 "contact legt met een oudere server die het niet ondersteunt."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Externe symlinks opzoeken (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1109,15 +1073,16 @@ msgstr ""
 "het algemeen een goed idee. U wilt dit alleen uitschakelen als de server de -"
 "L optie van LIST niet ondersteunt"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Bestanden binair overzenden"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1127,273 +1092,328 @@ msgstr ""
 "laten. Als u binaire informatie overzendt, wilt u dit zeker uitgeschakeld "
 "hebben."
 
-#: ../lib/rfc959.c:322 ../lib/rfc959.c:331 ../lib/rfc959.c:342
-#: ../lib/rfc959.c:789 ../lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ongeldige respons '%c' ontvangen van de server.\n"
 
-#: ../lib/rfc959.c:679 ../lib/rfc959.c:689
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Kan geen IPv4-socket maken: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Kan geen IP adres in PASV antwoord vinden: '%s'\n"
 
-#: ../lib/rfc959.c:715
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
-msgstr "Het IP-adres in het PASV-antwoord wordt genegeerd, verbinden met %d.%d.%d.%d:%d\n"
+msgstr ""
+"Het IP-adres in het PASV-antwoord wordt genegeerd, verbinden met %d.%d.%d.%d:"
+"%d\n"
 
-#: ../lib/rfc959.c:726 ../lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Kan geen gegevensverbinding maken: %s\n"
 
-#: ../lib/rfc959.c:738 ../lib/rfc959.c:759 ../lib/rfc959.c:912
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Kan naam van buis niet verkrijgen: %s\n"
 
-#: ../lib/rfc959.c:749 ../lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Kan niet binden aan poort: %s\n"
 
-#: ../lib/rfc959.c:768 ../lib/rfc959.c:921
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Kan niet luisteren aan poort %d: %s\n"
 
-#: ../lib/rfc959.c:817
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Kan geen IPv6-socket maken: %s\n"
 
-#: ../lib/rfc959.c:837
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Fout: Het lijkt erop dat we niet verbonden zijn via IPv6. Verbinding wordt "
 "verbroken.\n"
 
-#: ../lib/rfc959.c:865 ../lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Ongeldige EPSV-reactie '%s'\n"
 
-#: ../lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kan adres van lokale poort niet vinden: %s\n"
 
-#: ../lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kan geen verbinding met server accepteren: %s\n"
 
-#: ../lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "totaal"
 
-#: ../lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Waarschuwing: kan lijst %s niet ontleden\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "%s opzoeken\n"
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "Kan de hostnaam %s niet vinden: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Mislukt om buis te maken: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Probeer %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 "Kan geen verbinding met %s maken: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Verbonden met %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 ""
+"Kan servicenaam %s/tcp niet opzoeken. Controleer alstublieft uw service-"
+"bestand\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Verbinding naar %s timeout\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Kan buis opties niet verkrijgen: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Kan buis niet op niet-blokeren zetten: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH programmanaam:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Het pad naar het SSH uitvoerbaar bestand"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH extra parameters:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Extra parameters om aan het SSH programma door te geven"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH gebruiker/wachtwoord nodig"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Gebruikersnaam/wachtwoord voor SSH verbindingen nodig"
 
-#: ../lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Lopend programma %s\n"
 
-#: ../lib/sshv2.c:307
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Voer geheime zin in voor de RSA sleutel"
 
-#: ../lib/sshv2.c:308
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Voer geheime zin in voor sleutel '"
 
-#: ../lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../lib/sshv2.c:310
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "wachtwoord"
 
-#: ../lib/sshv2.c:414
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nee)?"
 
-#: ../lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Invoeren PASSCODE:"
 
-#: ../lib/sshv2.c:436 ../src/gtk/gtkui.c:118 ../src/gtk/transfer.c:554
-#: ../src/gtk/transfer.c:564
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Geef wachtwoord"
 
-#: ../lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Voer uw SecureID wachtwoord in:"
 
-#: ../lib/sshv2.c:487
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Fout: er is een onjuist wachtwoord ingevoerd\n"
 
-#: ../lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protocol initialisatie\n"
 
-#: ../lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protocol versie %d\n"
 
-#: ../lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s openen\n"
 
-#: ../lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Sluiten\n"
 
-#: ../lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Map %s openen\n"
 
-#: ../lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Map lezen\n"
 
-#: ../lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Kan bestand %s niet verwijderen\n"
 
-#: ../lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Map maken %s\n"
 
-#: ../lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Map verwijderen %s\n"
 
-#: ../lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Echtpad %s\n"
 
-#: ../lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Bestandsrechten\n"
 
-#: ../lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:609 ../src/gtk/bookmarks.c:1045 ../src/gtk/bookmarks.c:1298
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:368
-#: ../src/gtk/misc-gtk.c:1011 ../src/gtk/options_dialog.c:1208
-#: ../src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:615
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Bestand of map bestaat niet"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: ../lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Mislukt"
 
-#: ../lib/sshv2.c:624
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Slecht bericht"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Geen verbinding"
 
-#: ../lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Verbinding verloren"
 
-#: ../lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operatie niet ondersteund"
 
-#: ../lib/sshv2.c:636
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Onbekend bericht ontavngen van server"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Fout: Berichtgrootte %d te groot\n"
 
-#: ../lib/sshv2.c:730 ../lib/sshv2.c:1225 ../lib/sshv2.c:1821
-#: ../lib/sshv2.c:1959
+#: 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 "Fout: Berichtgrootte %d van server te groot\n"
 
-#: ../lib/sshv2.c:736
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1401,42 +1421,42 @@ msgstr ""
 "Er is een fout opgetreden bij het opzetten van de SSH-verbinding met de "
 "server. De foutmelding van de server volgt:\n"
 
-#: ../lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH verbinding met %s openen\n"
 
-#: ../lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Succesvol verbonden met SSH server %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-motor"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL entropiebestand:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropiebestand"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Zaadlengte van entropie:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 "Het maximum aantal te gebruiken bytes voor het starten van de SSL-motor"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL peer verifiëren"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1449,11 +1469,11 @@ msgstr ""
 "Onderwerp = %s\n"
 "Fout %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Kan certificaat van contactpersoon niet verkrijgen\n"
 
-#: ../lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1462,55 +1482,45 @@ msgstr ""
 "FOUT: De host in het SSL-certificaat (%s) komt niet overeen met de host "
 "waarmee we contact leggen (%s). Verbinding wordt verbroken.\n"
 
-#: ../lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Kan de SSL-bibliotheek niet initialiseren\n"
 
-#: ../lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Fout bij laden van standaard SSL-certificaten\n"
 
-#: ../lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Fout bij opstellen coderingslijst (geen geldige coderingen)\n"
 
-#: ../lib/sslcommon.c:342 ../lib/sslcommon.c:416 ../lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Fout: SSL-motor is niet gestart\n"
 
-#: ../lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Fout bij opzetten van SSL-verbinding (BIO object)\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Fout bij opzetten van SSL-verbinding (SSL object)\n"
 
-#: ../lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Fout in certificaat van contactpersoon: %s\n"
 
-#: ../src/uicommon/gftpui.c:91
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Wacht %d seconden om opnieuw te proberen verbinden\n"
-
-#: ../src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Actie afgebroken\n"
 
-#: ../src/uicommon/gftpui.c:190
-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 ""
-">. Voor vragen, commentaar of suggesties over dit programma, stuur een mail. "
-"Het laatste nieuws over gFTP is te vinden op de website http://gftp.seul.";
-"org/\n"
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Wacht %d seconden om opnieuw te proberen verbinden\n"
 
-#: ../src/uicommon/gftpui.c:191
+#: 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 "
@@ -1520,73 +1530,73 @@ msgstr ""
 "bestand. Dit is vrije software, en is vrij te kopiëren onder zekere "
 "voorwaarden. Zie hiervoor het COPYING bestand\n"
 
-#: ../src/uicommon/gftpui.c:193 ../src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Vertaald door"
 
-#: ../src/uicommon/gftpui.c:240 ../src/uicommon/gftpui.c:282
-#: ../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:872
+#: 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 "Fout: Niet verbonden met een externe site\n"
 
-#: ../src/uicommon/gftpui.c:251
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "gebruik: chmod <modus> <bestand>\n"
 
-#: ../src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "gebruik: hernoem <oude naam> <nieuwe naam>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "gebruik: delete <bestand>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "gebruik: rmdir <map>\n"
 
-#: ../src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "gebruik: site <site commando>\n"
 
-#: ../src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "gebruik: mkdir <nieuwe map>\n"
 
-#: ../src/uicommon/gftpui.c:469 ../src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "gebruik: chdir <map>\n"
 
-#: ../src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Ongeldig argument\n"
 
-#: ../src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Wis de map buffer\n"
 
-#: ../src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "gebruik: open "
 
-#: ../src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "gebruik: set [variabele = waarde]\n"
 
-#: ../src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Fout: Variabele %s is geen geldige configuratievariabele.\n"
 
-#: ../src/uicommon/gftpui.c:754
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Fout: Variabele %s is niet beschikbaar in de tekst versie van gFTP\n"
 
-#: ../src/uicommon/gftpui.c:836
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1594,319 +1604,324 @@ msgstr ""
 "Ondersteunde commando's:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "gebruik: %s <bestandspec>\n"
 
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "info"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP informatie"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Zet de huidige bestandsoverdracht modus naar ascii (alleen voor FTP)"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binair"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Zet de huidige bestandsoverdracht modus naar binair (alleen voor FTP)"
 
-#: ../src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:971 ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Verandert de externe werkmap"
 
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Verandert de rechten van een extern bestand"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "wissen"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Beschikbare opties: buffer"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "sluiten"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Verbreekt de verbinding met de externe site"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "verwijder"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Verwijdert een extern bestand"
 
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:983 ../src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Geeft de map-inhoud voor de huidige externe map"
 
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:985 ../src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Externe bestanden downloaden"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "geeft dit help scherm"
 
-#: ../src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:989 ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Verandert de lokale werkmap"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Verandert de rechten van een lokaal bestand"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "lverwijder"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Verwijdert een lokaal bestand"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:997 ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Geeft de map-inhoud voor de huidige lokale werkmap"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Maakt een lokale map"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Geeft de huidige lokale map"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lhernoem"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Hernoem een lokaal bestand"
 
-#: ../src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Verwijdert een lokale map"
 
-#: ../src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Maakt een externe map:"
 
-#: ../src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:1015 ../src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Lokale bestanden uploaden"
 
-#: ../src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "openen"
 
-#: ../src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Opent een verbinding naar een externe site"
 
-#: ../src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Geeft de huidige externe map"
 
-#: ../src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "afsluiten"
 
-#: ../src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP afsluiten"
 
-#: ../src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "hernoem"
 
-#: ../src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Een extern bestand hernoemen"
 
-#: ../src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Verwijdert een externe map"
 
-#: ../src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Configuratiebestand variabelen weergeven. U kunt ook variabelen instellen "
 "met 'set var=wrd'"
 
-#: ../src/uicommon/gftpui.c:1031
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Voe een site-specifiek commando uit"
 
-#: ../src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Fout: Commando niet herkend\n"
 
-#: ../src/uicommon/gftpui.c:1375
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-"Fout: externe site verbrak de verbinding na poging om bestandsoverdracht te "
-"starten\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "%s is succesvol overgedragen met %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Kan %s niet van %s downloaden\n"
+msgid "Skipping file %s on host %s\n"
+msgstr "Bestand %s overgeslagen op host %s\n"
 
-#: ../src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "%s is succesvol overgedragen met %.2f KB/s\n"
+msgid "Stopping the transfer on host %s\n"
+msgstr "Stop de overdracht op host %s\n"
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Kan %s niet van %s downloaden\n"
 
-#: ../src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "There was an error transfering the file %s"
-msgstr "Er was een fout bij het overdragen van bestand %s"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:213
-#: ../src/gtk/gftp-gtk.c:1063 ../src/gtk/misc-gtk.c:512
-#: ../src/gtk/misc-gtk.c:520
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: De stopknop moet eerst aangeklikt worden, om iets anders te doen\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Bladwijzers starten"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 "Bladwijzer toevoegen: er moet een naam voor de bladwijzer ingevuld worden\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Bladwijzer toevoegen: kan bladwijzer %s niet aanmaken omdat de naam al "
 "bestaat\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Bladwijzer toevoegen"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Bladwijzer toevoegen: er moet een hostnaam ingevuld worden\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1916,135 +1931,140 @@ msgstr ""
 "Met een / kunnen submenus aangegeven worden\n"
 "(bv: Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: ../src/gtk/bookmarks.c:473 ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr ""
+"Bladwijzer toevoegen: er moet een naam voor de bladwijzer ingevuld worden\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nieuwe map"
 
-#: ../src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Geef de naam van de aan te maken map"
 
-#: ../src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Bestand/Nieuw veld..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Geef de naam van het aan te maken veld"
 
-#: ../src/gtk/bookmarks.c:557
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Moeten bladwijzer %s en alle onderliggende\n"
 "bladwijzers verwijderd worden?"
 
-#: ../src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Bladwijzer verwijderen"
 
-#: ../src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../src/gtk/bookmarks.c:850 ../src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Ingang bewerken"
 
-#: ../src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: ../src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Hostnaam:"
 
-#: ../src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Poort:"
 
-#: ../src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Externe map:"
 
-#: ../src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokale map:"
 
-#: ../src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: ../src/gtk/bookmarks.c:1003 ../src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Account:"
 
-#: ../src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Aanmelden als ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1056 ../src/gtk/bookmarks.c:1309
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:380
-#: ../src/gtk/options_dialog.c:1219 ../src/gtk/options_dialog.c:1453
-msgid "  Cancel  "
-msgstr "  Annuleren  "
-
-#: ../src/gtk/bookmarks.c:1065 ../src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Toepassen"
-
-#: ../src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: ../src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Bestand/tearoff"
 
-#: ../src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Bestand/Nieuwe map..."
 
-#: ../src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Bestand/Nieuw veld..."
 
-#: ../src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Bestand/Verwijderen"
 
-#: ../src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Bestand/Instellingen..."
 
-#: ../src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Bestand/sep"
 
-#: ../src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Bestand/Sluiten"
 
-#: ../src/gtk/bookmarks.c:1240 ../src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Bladwijzers bewerken"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2052,91 +2072,90 @@ msgstr ""
 "De eigenschappen van de bestanden kunnen nu aangepast worden\n"
 "NB: Niet alle ftp servers ondersteunen de chmod optie"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciaal"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Plakkerig"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lezen"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Schrijven"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Ander"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Weet u zeker dat u deze %ld bestanden en %ld mappen wilt verwijderen?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Weet u zeker dat u deze %ld bestanden wilt verwijderen"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Weet u zeker dat u deze %ld mappen wilt verwijderen"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Bestanden/mappen verwijderen"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1064 ../src/gtk/misc-gtk.c:946
-#: ../src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s ontvangen\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Klik en Sleep"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2144,472 +2163,508 @@ msgstr ""
 "Er zijn bestandsoverdrachten bezig.\n"
 "Weet u zeker dat u wilt afsluiten?"
 
-#: ../src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr "Verbinden via URL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Opties"
 
-#: ../src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Geef een URL op om verbinding mee te maken"
 
-#: ../src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "OpenURL"
-
-#: ../src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Venster 1"
 
-#: ../src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Venster 2"
 
-#: ../src/gtk/gftp-gtk.c:250 ../src/gtk/gftp-gtk.c:255
-#: ../src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: ../src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binair"
 
-#: ../src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Opties..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Bestand/Instellingen..."
 
-#: ../src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Afsluiten"
 
-#: ../src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokaal"
 
-#: ../src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokaal/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokaal/URL openen..."
 
-#: ../src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokaal/Verbinding verbreken"
 
-#: ../src/gtk/gftp-gtk.c:264 ../src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokaal/sep"
 
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokaal/Bestandsspec veranderen..."
 
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokaal/Geselecteerde weergeven"
 
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokaal/Alles selecteren"
 
-#: ../src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokaal/Alle bestanden selecteren"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokaal/Alles deselecteren"
 
-#: ../src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokaal/Bestandenlijst opslaan..."
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokaal/SITE-opdracht verzenden..."
 
-#: ../src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokaal/Map veranderen"
 
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Lokaal/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Lokaal/Map maken..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Bestand/Nieuwe map..."
 
-#: ../src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Lokaal/Hernoemen..."
 
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Lokaal/Verwijderen..."
 
-#: ../src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Lokaal/Bewerken..."
 
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Lokaal/Weergave..."
 
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Lokaal/Verversen"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Extern"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Extern/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Extern/_URL openen..."
 
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Extern/Verbinding verbreken"
 
-#: ../src/gtk/gftp-gtk.c:287 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Extern/sep"
 
-#: ../src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Extern/Bestandsspec veranderen..."
 
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Extern/Geselecteerde weergeven"
 
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Extern/Alles selecteren"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Extern/Alle bestanden selecteren"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Extern/Alles deselecteren"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Extern/Bestandenlijst opslaan..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Extern/SITE-opdracht verzenden..."
 
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Extern/Map veranderen"
 
-#: ../src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Extern/Chmod..."
 
-#: ../src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr "/Extern/Map maken..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Bestand/Nieuwe map..."
 
-#: ../src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Extern/Hernoemen..."
 
-#: ../src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Extern/Verwijderen..."
 
-#: ../src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Extern/Bewerken..."
 
-#: ../src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Extern/Weergave..."
 
-#: ../src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Extern/Verversen"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Bl_adwijzers"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bladwijzers/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bladwijzers/Bladwijzers toevoegen"
 
-#: ../src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bladwijzers/Bladwijzers bewerken"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bladwijzers/sep"
 
-#: ../src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Overdracht"
 
-#: ../src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Overdracht/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/Overdracht/Overdracht starten"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Overdracht/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/Overdracht/Overdracht stoppen"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Overdracht/sep"
 
-#: ../src/gtk/gftp-gtk.c:315 ../src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Overdracht/sep"
 
-#: ../src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Overdracht/Huidige bestand overslaan"
 
-#: ../src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Overdracht/Bestand verwijderen"
 
-#: ../src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Overdracht/Bestand omhoog verplaatsen"
 
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Overdracht/Bestand omlaag verplaatsen"
 
-#: ../src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Overdracht/Bestanden ontvangen"
 
-#: ../src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Overdracht/Bestanden verzenden "
 
-#: ../src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/Logboe_k"
 
-#: ../src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Logboek/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Logboek/Wissen"
 
-#: ../src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
 msgstr "/Logboek/Logboek bekijken"
 
-#: ../src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Logboek/Logboek oplaan..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/E_xtra"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Extra/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Extra/Vensters vergelijken"
 
-#: ../src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Extra/Buffer leegmaken"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Hulp"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Hulp/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Hulp/Info"
 
-#: ../src/gtk/gftp-gtk.c:458
-msgid "Host: "
-msgstr "Host: "
-
-#: ../src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Host: "
 
-#: ../src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Poort: "
 
-#: ../src/gtk/gftp-gtk.c:507
-msgid "User: "
-msgstr "Naam: "
-
-#: ../src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_gebruikersnaam: "
 
-#: ../src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Wachtwoord: "
 
-#: ../src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Opdracht: "
 
-#: ../src/gtk/gftp-gtk.c:746 ../src/gtk/gftp-gtk.c:952
-#: ../src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Grootte"
 
-#: ../src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Rechten"
 
-#: ../src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Fout: Er is geen host gegeven om verbinding mee te maken\n"
 
-#: ../src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Verversen"
 
-#: ../src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Invoer gebruikersnaam:"
 
-#: ../src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Geef uw wachtwoord voor deze site"
 
-#: ../src/gtk/gtkui.c:119 ../src/gtk/transfer.c:555 ../src/gtk/transfer.c:565
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Geef uw wachtwoord voor deze site"
 
-#: ../src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Actie afgebroken...u moet een tekenreeks invoeren\n"
 
-#: ../src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Map maken"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Geef de naam van de aan te maken map"
 
-#: ../src/gtk/gtkui.c:346 ../src/gtk/gtkui.c:358 ../src/gtk/misc-gtk.c:949
-#: ../src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: ../src/gtk/gtkui.c:356
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Wat moet de nieuwe naam van %s worden?"
 
-#: ../src/gtk/gtkui.c:378 ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Site"
 
-#: ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Geef site-specifiek commando"
 
-#: ../src/gtk/gtkui.c:382
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE ervoor zetten"
 
-#: ../src/gtk/gtkui.c:425 ../src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:450
-#: ../src/gtk/transfer.c:533 ../src/gtk/transfer.c:1012
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Overgeslagen"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:512
-#: ../src/gtk/transfer.c:537
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Wachten..."
 
-#: ../src/gtk/gtkui_transfer.c:124 ../src/gtk/gtkui_transfer.c:303
-#: ../src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: ../src/gtk/gtkui_transfer.c:131 ../src/gtk/gtkui_transfer.c:309
-#: ../src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Hervatten"
 
-#: ../src/gtk/gtkui_transfer.c:138 ../src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Overslaan"
 
-#: ../src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Actie"
 
-#: ../src/gtk/gtkui_transfer.c:224 ../src/gtk/gtkui_transfer.c:233
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Bestanden Overdragen"
 
-#: ../src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2617,61 +2672,60 @@ msgstr ""
 "De volgende bestanden bestaan zowel op de lokale als de externe computer\n"
 "Selecteer wat er moet gebeuren"
 
-#: ../src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Fout"
 
-#: ../src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Bestand overslaan"
 
-#: ../src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: ../src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Alles deselecteren"
 
-#: ../src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Bestandsspec veranderen: actie afgebroken...u moet een tekenreeks invoeren\n"
 
-#: ../src/gtk/menu-items.c:74 ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Bestandsspec veranderen"
 
-#: ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Geef nieuwe bestandsspecificatie"
 
-#: ../src/gtk/menu-items.c:105 ../src/gtk/menu-items.c:313
-#: ../src/gtk/menu-items.c:377 ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Fout: kan %s niet openen voor schrijven: %s\n"
 
-#: ../src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Bestandenlijst opslaan"
 
-#: ../src/gtk/menu-items.c:341 ../src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Fout: Fout bij schrijven naar %s: %s\n"
 
-#: ../src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Log bestand succesvol naar %s geschreven\n"
 
-#: ../src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Log opslaan"
 
-#: ../src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2680,115 +2734,96 @@ msgstr ""
 "Kan het licentiebestand COPYING niet vinden. Controleer of dit bestand "
 "aanwezig is in %s of in %s"
 
-#: ../src/gtk/menu-items.c:468 ../src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Info over gFTP"
 
-#: ../src/gtk/menu-items.c:504
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Copyright © 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Officiële Webpagina: http://www.gftp.org/\n";
 "Logo door: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Info"
 
-#: ../src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licentie Overeenkomst"
 
-#: ../src/gtk/menu-items.c:571 ../src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr "  Sluiten  "
-
-#: ../src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Vergelijk Vensters"
 
-#: ../src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Verbinding verbreken met de externe server"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
-msgstr "Verbinden met de opgegeven site in het host-veld. Indien het host-veld leeg is, wordt een 
dialoogvenster geopend waarin u een URL kunt invoeren."
+msgstr ""
+"Verbinden met de opgegeven site in het host-veld. Indien het host-veld leeg "
+"is, wordt een dialoogvenster geopend waarin u een URL kunt invoeren."
 
-#: ../src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Alle bestanden"
 
-#: ../src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Gebufferd) ["
 
-#: ../src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: ../src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Fout tijdens openen van bestand %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Niet verbonden met externe site\n"
 
-#: ../src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Deze optie is nog niet beschikbaar met dit protocol\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Er mag maar een onderdeel geselecteerd zijn\n"
 
-#: ../src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Er moet minstens een onderdeel geselecteerd zijn\n"
 
-#: ../src/gtk/misc-gtk.c:943 ../src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Wijzigen"
 
-#: ../src/gtk/misc-gtk.c:1014 ../src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Toevoegen"
-
-#: ../src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../src/gtk/misc-gtk.c:1110
-msgid "  Yes  "
-msgstr "  Ja  "
-
-#: ../src/gtk/misc-gtk.c:1120
-msgid "  No  "
-msgstr "  Nee  "
-
-#: ../src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Bestandenlijst aan het ophalen"
 
-#: ../src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2797,105 +2832,89 @@ msgstr ""
 "%ld mappen en\n"
 "%ld bestanden ontvangen"
 
-#: ../src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Fout: kan bestand %s niet in %s of %s vinden\n"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Host bewerken"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Host toevoegen"
 
-#: ../src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Type:"
-
-#: ../src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/gtk/options_dialog.c:1017 ../src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domein"
 
-#: ../src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr "Netwerkadres"
-
-#: ../src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Netwerkadres:"
 
-#: ../src/gtk/options_dialog.c:1091 ../src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr "Netmasker"
-
-#: ../src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "N_etmasker:"
 
-#: ../src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domein:"
 
-#: ../src/gtk/options_dialog.c:1250
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Netmasker"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokale hosts"
 
-#: ../src/gtk/options_dialog.c:1291 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../src/gtk/options_dialog.c:1293
-msgid "_Edit"
-msgstr "Be_werken"
-
-#: ../src/gtk/options_dialog.c:1370 ../src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opties"
 
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Bestandsnamen aan het ontvangen..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:681
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Verbinding maken..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Bestanden ontvangen: Er is geen verbinding met een externe site\n"
 
-#: ../src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Fout: subproces %d geeft %d\n"
 
-#: ../src/gtk/transfer.c:358
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Subproces %d is succesvol\n"
 
-#: ../src/gtk/transfer.c:362
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Fout: subproces %d is niet goed gesloten\n"
 
-#: ../src/gtk/transfer.c:372
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Fout: kan geen informatie over bestand %s vinden: %s\n"
 
-#: ../src/gtk/transfer.c:377
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Bestand %s is niet gewijzigd\n"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2904,124 +2923,218 @@ msgstr ""
 "Bestand %s is gewijzigd.\n"
 "Wilt u het uploaden?"
 
-#: ../src/gtk/transfer.c:388
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Bestand bewerken"
 
 # voltooid/klaar
-#: ../src/gtk/transfer.c:453
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Klaar"
 
-#: ../src/gtk/transfer.c:493
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Ontv %s van %s met %.2fKB/s %02d:%02d:%02d resterende tijd"
+
+#: src/gtk/transfer.c:739
+#, c-format
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Ontv %s van %s met %.2fKB/s %02d:%02d:%02d resterende tijd"
+
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Ontv %s van %s, overdracht gestremd, eindtijd onbekend"
+
+#: src/gtk/transfer.c:756
 #, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Stop de overdracht van %s\n"
+msgid "Recv %s of %s, transfer stalled, unknown time remaining"
+msgstr "Ontv %s van %s, overdracht gestremd, eindtijd onbekend"
 
-#: ../src/gtk/transfer.c:727
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Onbekend percentage voltooid. (Bestand %ld van %ld)"
 
-#: ../src/gtk/transfer.c:731
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% voltooid, %02d:%02d:%02d resterende tijd. (Bestand %ld van %ld)"
 
-#: ../src/gtk/transfer.c:761
-#, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "Ontv %s van %s met %.2fKB/s %02d:%02d:%02d resterende tijd"
-
-#: ../src/gtk/transfer.c:770
-#, c-format
-msgid "Recv %s of %s, transfer stalled, unknown time remaining"
-msgstr "Ontv %s van %s, overdracht gestremd, eindtijd onbekend"
-
-#: ../src/gtk/transfer.c:805
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Bestandsnamen ontvangen...%s bytes"
 
-#: ../src/gtk/transfer.c:884 ../src/gtk/transfer.c:906
-#: ../src/gtk/transfer.c:940 ../src/gtk/transfer.c:980
-#: ../src/gtk/transfer.c:1033 ../src/gtk/transfer.c:1093
+#: 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 "Er zijn geen bestandsoverdrachten geselecteerd\n"
 
-#: ../src/gtk/transfer.c:924
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Stop de overdracht op host %s\n"
-
-#: ../src/gtk/transfer.c:965 ../src/gtk/transfer.c:1018
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Bestand %s overgeslagen op host %s\n"
-
-#: ../src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Weergave"
 
-#: ../src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Bewerken"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Weergave: %s is een map. Kan niet weergeven.\n"
 
-#: ../src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Bewerken: er moet een editor in de opties aangegeven zijn\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 "Bewerken: %s is een map. Kan die niet bewerken.\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 "Bewerken: er moet een editor in de opties aangegeven zijn\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Weergave: kan geen ander proces afsplitsen: %s\n"
 
-#: ../src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Start programma: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:271
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Open %s met %s\n"
 
-#: ../src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Weergave bestand %s\n"
 
-#: ../src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Weergave: kan bestand %s niet openen: %s\n"
 
-#: ../src/text/gftp-text.c:176
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kan hoofdterminal %s niet openen\n"
 
-#: ../src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Gebruikersnaam [anonymous]:"
 
-#: ../src/text/textui.c:143
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s bestaat reeds. (%s bron grootte, %s doel grootte):\n"
 "(o)verschrijven, doo(r)gaan, (s)la over, (O)verschijf Alle, doo(R)gaan Alle, "
 "(S)la Alle over: (%c)"
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Opstartmap:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "De map die bij het opstarten van gFTP geladen wordt"
+
+#~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+#~ msgstr ""
+#~ "Fout bij converteren van tekenreeks '%s' naar UTF-8 van huidige locale: "
+#~ "%s\n"
+
+#~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+#~ msgstr ""
+#~ "Fout bij converteren van tekenreeks '%s' naar huidige locale van UTF-8: "
+#~ "%s\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 ""
+#~ ">. Voor vragen, commentaar of suggesties over dit programma, stuur een "
+#~ "mail. Het laatste nieuws over gFTP is te vinden op de website http://gftp.";
+#~ "seul.org/\n"
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Fout: externe site verbrak de verbinding na poging om bestandsoverdracht "
+#~ "te starten\n"
+
+#~ msgid "There was an error transfering the file %s"
+#~ msgstr "Er was een fout bij het overdragen van bestand %s"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Annuleren  "
+
+#~ msgid "Apply"
+#~ msgstr "Toepassen"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Verbinden via URL"
+
+#~ msgid "OpenURL"
+#~ msgstr "OpenURL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Opties..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Lokaal/Map maken..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Extern/Map maken..."
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Overdracht/Overdracht starten"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Overdracht/Overdracht stoppen"
+
+#~ msgid "Host: "
+#~ msgstr "Host: "
+
+#~ msgid "User: "
+#~ msgstr "Naam: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Sluiten  "
+
+#~ msgid "Add"
+#~ msgstr "Toevoegen"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Ja  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nee  "
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Network Address"
+#~ msgstr "Netwerkadres"
+
+#~ msgid "_Edit"
+#~ msgstr "Be_werken"
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Stop de overdracht van %s\n"
+
 #~ msgid "Starting the file transfer at offset %lld\n"
 #~ msgstr "Bestandsoverdracht gestart vanaf offset %lld\n"
 
diff --git a/po/oc.po b/po/oc.po
index 1ae4730..f3170ce 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -9,157 +9,163 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 10:20+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-12-23 12:07+0100\n"
 "Last-Translator: Yannig Marchegay (Kokoyaya) <yannig marchegay org>\n"
 "Language-Team: Occitan <ubuntu-l10n-oci lists ubuntu com>\n"
+"Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr ""
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr ""
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Error : impossible de crear lo repertòri %s : %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Error : impossible de crear lo fichièr temporari : %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr ""
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 ""
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3220
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error : impossible de dobrir lo fichièr local %s : %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2921 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2842 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Alèrta : impossible de trobar lo fichièr principal dels favorits %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Error gFTP : impossible de dobrir lo fichièr dels favorits %s : %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: ../lib/config_file.c:504
+#: 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 ""
 
-#: ../lib/config_file.c:507
+#: 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:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Error gFTP : impossible de crear lo repertòri %s : %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Error  gFTP : impossible de trobar lo fichièr de configuracion principal %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Avètz fach un 'make install' ?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr ""
 "Error de gFTP : impossible de dobrir lo fichièr de configuracion %s : %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr ""
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Alèrta gFTP : impossible de dobrir %s en escritura : %s\n"
 
-#: ../lib/config_file.c:732
+#: 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 ""
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -167,829 +173,766 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:845
+#: 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 ""
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconegut>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Error : impossible d'enviar lo fichièr %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Error : impossible d'escriure dins lo fichièr %s : %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Error : error al moment de tampar lo fichièr : %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1580
-#: ../lib/protocols.c:1581 ../lib/protocols.c:1622 ../lib/protocols.c:1623
-#: ../lib/protocols.c:1689 ../lib/protocols.c:1696 ../lib/protocols.c:1772
-#: ../lib/protocols.c:1773 ../lib/protocols.c:1809
+#: 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 "desconegut"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Impossible d'anar dins lo repertòri %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s suprimit amb succès\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Error : impossible de suprimir lo repertòri %s : %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Error : impossible de suprimir lo fichièr %s :%s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Repertòri %s creat amb succès\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr ""
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr ""
 
-#: ../lib/ftps.c:157
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr ""
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr ""
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Impossible d'anar dins lo repertòri local %s : %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr ""
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr ""
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr ""
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistèma de fichièrs local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "sintaxi : gftp "
 
 # The following items are the proxy types listed under the Options dialog
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "pas cap"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fichièr"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "talha"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "utilizaire"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grop"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "data e ora"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "permissions"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descreissent"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "creissent"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programa de visualizacion :"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programa d'edicion :"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Lo programa d'edicion de documents per defaut."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME distant :"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Apondre los transferiments de fichièrs"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Apondre un fichièr de transferir a la tièra"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Sonque un transferiment al còp"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Permetre sonque un transferiment al meteis temps ?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Remplaçar per defaut"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Remplaçar los fichièrs per defaut o contunhar los transferiments de fichièrs"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Conservar las permissions de fichièrs"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
-msgstr ""
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
+msgstr "Conservar la data dels fichièrs transferits"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr ""
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Conservar la data dels fichièrs transferits"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr ""
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+msgid "Refresh the listbox after each file is transferred"
 msgstr ""
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Los repertòris en primièr"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr ""
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Visualizar los fichièrs amagats"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr ""
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr ""
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr ""
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Aviar los transferiments de fichièrs"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr ""
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr ""
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr ""
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Ret"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr ""
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr ""
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocòl per defaut :"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr ""
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activar la gestion d'IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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 ""
 
 # Je suis pas trop sûr de la traduction
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Largor per defaut de la fenèstra dels fichièrs locals"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Largor per defaut de la fenèstra dels fichièrs distant (òste)"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr ""
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Nautor per defaut de la fenèstra de transferiment de fichièrs"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr ""
 
-#: ../lib/options.h:177
+#: 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 ""
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr ""
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr ""
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "La color de las comandas enviadas al servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr ""
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "La color dels messatges d'error"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr ""
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Favorit"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: ../lib/protocols.c:465
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:692
+#: lib/protocols.c:450
 #, 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:723
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:756
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error : impossible de trobar lo favorit %s\n"
 
-#: ../lib/protocols.c:763
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: ../lib/protocols.c:885 ../lib/protocols.c:912
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: ../lib/protocols.c:1204 ../lib/protocols.c:1219 ../lib/protocols.c:2387
-#: ../lib/protocols.c:2514
-#, c-format
-msgid "Looking up %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:1210 ../lib/protocols.c:1224 ../lib/protocols.c:2392
-#: ../lib/protocols.c:2519
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Impossible de trobar lo nom d'òste %s : %s\n"
-
-#: ../lib/protocols.c:2135
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:2409
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2415 ../lib/protocols.c:2535
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr ""
-
-#: ../lib/protocols.c:2420 ../lib/protocols.c:2542
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Impossible de se connectar a %s : %s\n"
-
-#: ../lib/protocols.c:2445
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Connectat a %s : %d\n"
-
-#: ../lib/protocols.c:2475 ../lib/rfc959.c:706
+#: lib/protocols.c:1531
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 
-#: ../lib/protocols.c:2499 ../lib/sshv2.c:1168
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: ../lib/protocols.c:2578 ../lib/protocols.c:3229 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:885
+#: lib/protocols.c:1634 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 ""
 
-#: ../lib/protocols.c:2818 ../lib/protocols.c:2896 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr ""
-
-#: ../lib/protocols.c:2966
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:2980
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:3126
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr ""
-
-#: ../lib/protocols.c:3134
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr ""
-
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Error : impossible d'executar ssh : %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr ""
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr ""
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr ""
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr ""
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr ""
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Utilizar HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Volètz utilizar HTTP/1.1 o HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Desconnexion del siti %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr ""
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr ""
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Comanda SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "utilizaire òste"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "utilizaire òste:pòrt"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICAR"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "utilizaire òste pòrt"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "utilizaire òste NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr ""
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalisat"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adreça electronica :"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr ""
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr ""
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1000,11 +943,11 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorar l'adreça PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1012,11 +955,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferiment de fichièrs en mòde passiu"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1026,11 +969,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1038,328 +981,379 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferir los fichièrs en mòde ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "Impossible de trobar lo nom d'òste %s : %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr "Impossible de se connectar a %s : %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Connectat a %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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr ""
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nom del programa SSH :"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr ""
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr ""
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr ""
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Execucion del programa %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr ""
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Mot de pas"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "mot de pas"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(òc/non) ?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr ""
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Picatz lo mot de pas"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr ""
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr ""
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d : version del protocòl %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d : dobrir %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d : tampar\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d : dobrir lo repertòri %s\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d : legir lo repertòri\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d : suprimir lo fichièr %s\n"
 
 # #Utilisé pour les messages d'alerte ##
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d : crear lo repertòri %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d : suprimir lo repertòri %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d : chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Validar"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr ""
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
 # The following few items are from the Edit Bookmarks dialog
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr ""
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Pas connectat"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Connexion perduda"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr ""
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 ""
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr ""
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr ""
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr ""
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1368,1226 +1362,1197 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: ../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 "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operacion anullada\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Pausa de %d segondas abans de tornar ensajar de se connectar\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 ""
-
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Revirat per"
 
-#: ../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 "Error : pas connectat a un sit distant\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "sintaxi : chmod <mòde> <fichièr>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "sintaxi : suprimir <fichièr>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "sintaxi : rmdir <repertòri>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "sintaxi : mkdir <repertòri novèl>\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 "sintaxi : chdir <repertòri>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "sintaxi : open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:720
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "a prepaus de"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Visualiza las entresenhas sus gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binari"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "suprimir"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "tampar"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Se desconnecta del servidor distant"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "suprimir"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Suprimís un fichièr distant"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "ajuda"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Visualiza aqueste ecran d'ajuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Suprimís un fichièr local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crea un repertòri local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Suprimir un repertòri local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Crear un repertòri distant"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "dobrir"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "sortir"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Sortir de gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "siti"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Dobrir lo favorit"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Apondre un favorit"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Se remembrar del mot de pas"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Repertòri novèl"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Element novèl"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Suprimir lo favorit"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Favorits"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nom d'òste :"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Pòrt :"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocòl :"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Repertòri local :"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nom d'utilizaire :"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Mot de pas :"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Compte :"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Anullar  "
-
 # The following few items are from the Edit Bookmarks dialog
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fichièr"
 
 # Keep the english word tearoff in here
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fichièr/_Repertòri novèl..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fichièr/_Element novèl..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fichièr/_Suprimir"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fichièr/_Propietats..."
 
 # Keep the english word sep in here
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fichièr/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fichièr/_Tampar"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Modificar los favorits"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
 # Utilisé pour les messages d'alerte
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
 # This is the column header under chmod for SUID and SGID
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
 # Set user id
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
 # Set group id
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Utilizaire"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lectura"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escritura"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Executar"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grop"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Autre"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Sètz segur que volètz suprimir aquestes %ld fichièrs"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr ""
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Suprimir"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Se connectar"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr ""
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Sortir"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Dobrir un emplaçament"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Sortir"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Seleccionar totes los fichièrs"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Distant"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Favorits"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Espleches"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Ajuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajuda/_A prepaus"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Òste : "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "Ò_ste : "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Pòrt : "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Utilizaire : "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Utilizaire : "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Mot de pas : "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comanda : "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nom de fichièr"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Talha"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Avançament"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Picatz lo nom d'utilizaire"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr ""
 
 # #Utilisé pour les messages d'alerte ##
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renommar"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Siti"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Ignorat"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Remplaçar"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Contunhar"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Sautar"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Accion"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferir los fichièrs"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr ""
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Ignorar lo fichièr"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Tot seleccionar"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Tot deseleccionar"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "A prepaus de gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2598,207 +2563,167 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "A prepaus de"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Contracte de licéncia"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Tampar  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparar las fenèstras"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Pas connectat"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Apondre"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Anullar"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Òc  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Non  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editar l'òste"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Apondre un òste"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipe :"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipe :"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domeni"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adreça de la ret"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Adreça de la _ret :"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr ""
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr ""
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domeni :"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr ""
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Òstes locales"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Edicion"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Edicion"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opcions"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Connection..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2807,114 +2732,153 @@ msgstr ""
 "Lo fichièr %s es estat modificat.\n"
 "Lo volètz enviar sul servidor ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editar lo fichièr"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Terminat"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: ../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
+#: 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 ""
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visualizacion"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edicion"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Dobèrtura de %s amb %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr ""
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
+#~ msgid "  Cancel  "
+#~ msgstr "  Anullar  "
+
+#~ msgid "Host: "
+#~ msgstr "Òste : "
+
+#~ msgid "User: "
+#~ msgstr "Utilizaire : "
+
+#~ msgid "  Close  "
+#~ msgstr "  Tampar  "
+
+#~ msgid "Add"
+#~ msgstr "Apondre"
+
+#~ msgid "Cancel"
+#~ msgstr "Anullar"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Òc  "
+
+#~ msgid "  No  "
+#~ msgstr "  Non  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipe :"
+
+#~ msgid "Network Address"
+#~ msgstr "Adreça de la ret"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edicion"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
 #~ msgid "\n"
 #~ msgstr "\n"
diff --git a/po/or.po b/po/or.po
index 75f4d8f..a796f80 100644
--- a/po/or.po
+++ b/po/or.po
@@ -6,101 +6,104 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-05-26 18:17+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-10-28 12:58+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri redhat com>\n"
 "Language-Team: Oriya <oriya-it googlegroups com>\n"
+"Language: or\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"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "ଅବୈଧ URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ତ୍ରୁଟି: କ୍ୟାଶେ ଅନୁକ୍ରମଣିକା ଫାଇଲରେ ଅବୈଧ ଧାଡ଼ି %s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "ବାକ୍ୟଖଣ୍ଡ '%s' କୁ ବର୍ଣ୍ଣମାଳା %s ରୁ ବର୍ଣ୍ଣମାଳା %s କୁ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"ବାକ୍ୟଖଣ୍ଡ '%s' କୁ ବର୍ଣ୍ଣମାଳା %s ରୁ ବର୍ଣ୍ଣମାଳା %s କୁ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ତ୍ରୁଟି: ସ୍ଥାନୀୟ ଫାଇଲ %s କୁ ଖୋଲିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ତ୍ରୁଟି: ସକେଟରେ ଲେଖିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ତ୍ରୁଟି: ସକେଟରୁ ପଢ଼ିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "ଚେତାବନୀ: ମୂଖ୍ୟ ଚିହ୍ନିତ ସ୍ଥାନ ଫାଇଲ %s କୁ ଖୋଜିପାରିବେ ନାହିଁ\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP ଚେତାବନୀ: ଧାଡ଼ି %d କୁ ଚିହ୍ନିତ ଫାଇଲରୁ ବାଦ ଦେଇ: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ଚେତାବନୀ: ଧାଡ଼ି %d ରେ ଯଥେଷ୍ଟ ସ୍ୱତନ୍ତ୍ରଚର ନାହିଁ\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -110,7 +113,7 @@ msgstr ""
 "ଉପଲବ୍ଧ) ପାଖକୁ ଯିବା ପାଇଁ ଦରକାର ହେବ ନାହିଁ । dont_use_proxy=.domain କିମ୍ବା "
 "dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -118,52 +121,52 @@ msgstr ""
 "ext=ଫାଇଲ ଅନୁଲଗ୍ନ:XPM ଫାଇଲ:Ascii ଅଥବା Binary (A ଅଥବା B):ଦର୍ଶକ ପ୍ରଗ୍ରାମ। ଟିପ୍ପଣୀ: "
 "ଫାଇଲ ଅନୁଲଗ୍ନ ବ୍ୟତୀତ ବାକି ସମସ୍ତ ପ୍ରାଚଳଗୁଡ଼ିକ ବୈକଳ୍ପିକ ଅଟେ"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "ଆପଣ ଗୋଟିଏ ସ୍ଥାପନ କ୍ରିୟା ସମାପନ କରିଛନ୍ତି କି?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP ତ୍ରୁଟି: ଖରାପ ଲଗ ଫାଇଲ ନାମ %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -171,230 +174,227 @@ msgstr ""
 "gFTP ପାଇଁ ଫାଇଲକୁ ଚିହ୍ନଟ କରନ୍ତୁ। Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. ଚେତାବନୀ: ଏହି ଫାଇଲରେ ଯୋଗ କରାଯାଉଥିବା ଯେକୌଣସି ଫାଇଲକୁ ନବଲିଖନ କରାଯିବ"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"ଟିପ୍ପଣୀ: ଫାଇଲ ମଧ୍ଯରେ ଥିବା ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ଏପଟ ସେପଟ ହୋଇଯାଇଛି। ଏହି "
-"ଆଲଗୋରିଦମଟି ସୁରକ୍ଷିତ ନୁହଁ। ଏହି ଫାଇଲକୁ ସମ୍ପାଦନ କରିବା ସମୟରେ ଆପଣଙ୍କ ପାଖରେ "
-"ଛିଡ଼ାହୋଇଥିବା କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ପାଇଁ ଆପଣଙ୍କ ପ୍ରବେଶ ସଂକେତକୁ ସହଜରେ ମନେରଖିବାରୁ "
-"ଏହା ଏଡାଇଥାଏ। ଏହା ପୂର୍ବରୁ, ସମସ୍ତ ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ସରଳ ପାଠ୍ୟରେ ସଂରକ୍ଷିତ ହୋଇଥାଏ।"
+"ଟିପ୍ପଣୀ: ଫାଇଲ ମଧ୍ଯରେ ଥିବା ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ଏପଟ ସେପଟ ହୋଇଯାଇଛି। ଏହି ଆଲଗୋରିଦମଟି ସୁରକ୍ଷିତ ନୁହଁ। "
+"ଏହି ଫାଇଲକୁ ସମ୍ପାଦନ କରିବା ସମୟରେ ଆପଣଙ୍କ ପାଖରେ ଛିଡ଼ାହୋଇଥିବା କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ପାଇଁ ଆପଣଙ୍କ ପ୍ରବେଶ "
+"ସଂକେତକୁ ସହଜରେ ମନେରଖିବାରୁ ଏହା ଏଡାଇଥାଏ। ଏହା ପୂର୍ବରୁ, ସମସ୍ତ ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ସରଳ ପାଠ୍ୟରେ "
+"ସଂରକ୍ଷିତ ହୋଇଥାଏ।"
 
-#: ../lib/config_file.c:845
+#: 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 ପାଇଁ ବିନ୍ୟାସ ଫାଇଲ। Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
-"org>. ଚେତାବନୀ: ଏହି ଫାଇଲରେ ଯୋଗ କରାଯାଉଥିବା ଯେକୌଣସି ଫାଇଲକୁ ନବଲିଖନ କରାଯିବ। "
-"ଯଦି କୌଣସି ଭରଣର ଟିପ୍ପଣୀରେ (*) ଥାଏ, ତେବେ ଆପଣ ଏହାକୁ gFTP ଭିତରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ"
+"org>. ଚେତାବନୀ: ଏହି ଫାଇଲରେ ଯୋଗ କରାଯାଉଥିବା ଯେକୌଣସି ଫାଇଲକୁ ନବଲିଖନ କରାଯିବ। ଯଦି କୌଣସି "
+"ଭରଣର ଟିପ୍ପଣୀରେ (*) ଥାଏ, ତେବେ ଆପଣ ଏହାକୁ gFTP ଭିତରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 "FATAL gFTP ତ୍ରୁଟି: ବିନ୍ୟାସ ବିକଳ୍ପ '%s' ଜାଗତିକ ହ୍ୟାସ ସାରଣୀରେ ମିଳିଲା ନାହିଁ\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ତ୍ରୁଟି: ଫାଇଲ %s କୁ ଧାରଣ କରିପାରିବେ ନାହିଁ\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ତ୍ରୁଟି: ଫାଇଲ %s କୁ ଲେଖିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ତ୍ରୁଟି: ଫାଇଲ ବନ୍ଦ କରିବାରେ ତ୍ରୁଟି: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP ସର୍ଭର %sରୁ ତାଲିକାଭୁକ୍ତ ତ୍ରୁଟିଯୁକ୍ତ ଫାଇଲ\n"
 
-#: ../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
+#: 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 "ଅଜ୍ଞାତ"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP ଡିରେକ୍ଟୋରୀ ତାଲିକାଭୁକ୍ତ %sକୁ ପାଇଲା ନାହିଁ: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "ଡ଼ିରେକ୍ଚୋରୀକୁ %s ମଧ୍ଯକୁ ସଫଳତାର ସହିତ ପରିବର୍ତ୍ତନ କରାଯାଇଛି\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀକୁ %s ମଧ୍ଯକୁ ପରିବର୍ତ୍ତନ କରିପାରିଲା ନାହିଁ\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%sକୁ ସଫଳତାର ସହିତ କଢ଼ାଯାଇଛି\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ତ୍ରୁଟି: ଫାଇଲ %s କୁ କଢ଼ାଯାଇପାରିଲା ନାହିଁ: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
-"FTPS ସମର୍ଥନ ଉପଲବ୍ଧ ନାହିଁ ଯେହେତୁ SSL ସମର୍ଥନକୁ ସଂକଳନ କରାହୋଇନାହିଁ। ସଂଯୋଗକୁ "
-"ପରିତ୍ୟାଗ କରୁଅଛି।\n"
+"FTPS ସମର୍ଥନ ଉପଲବ୍ଧ ନାହିଁ ଯେହେତୁ SSL ସମର୍ଥନକୁ ସଂକଳନ କରାହୋଇନାହିଁ। ସଂଯୋଗକୁ ପରିତ୍ୟାଗ କରୁଅଛି।\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "ଯେହେତୁ SSL ସମର୍ଥନ ସଂକଳିତ ହୋଇ ନ ଥିଲା ତେଣୁ HTTPS ସମର୍ଥନ ଉପଲବ୍ଧ ନାହିଁ। ସଂଯୋଗ ବ୍ଯର୍ଥ ହେଉଛି।\n"
+msgstr ""
+"ଯେହେତୁ SSL ସମର୍ଥନ ସଂକଳିତ ହୋଇ ନ ଥିଲା ତେଣୁ HTTPS ସମର୍ଥନ ଉପଲବ୍ଧ ନାହିଁ। ସଂଯୋଗ ବ୍ଯର୍ଥ ହେଉଛି।\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "ପ୍ରଚଳିତ କାର୍ଯ୍ୟକ୍ଷମ ଡିରେକ୍ଟୋରୀକୁ ପାଇବେ ନାହିଁ: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "ସ୍ଥାନୀୟ ଡ଼ିରେକ୍ଟୋରୀକୁ %s ରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "ସ୍ଥାନୀୟ ଡ଼ିରେକ୍ଟୋରୀକୁ %s ରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ତ୍ରୁଟି: ସ୍ଥାନୀୟ ଫାଇଲ %sକୁ ଯୋଡ଼ିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "ସ୍ଥାନୀୟ ଡ଼ିରେକ୍ଟୋରୀ ତାଲିକା %sକୁ ପାଇବେ ନାହିଁ: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%sର ଧାରା %o କୁ ସଫଳତାର ସହିତ ପରିବର୍ତ୍ତନ ହୋଇଛି\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ତ୍ରୁଟି: %sର ଧାରାକୁ %o ରେ ପରିବର୍ତ୍ତନ କରିପାରିଲା ନାହିଁ: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s ର ସମୟ ଚିହ୍ନକୁ ସଫଳତାର ସହିତ ପରିବର୍ତ୍ତନ କରାହୋଇଛି\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ତ୍ରୁଟି: %sର ସମୟ ଚିହ୍ନକୁ ପରିବର୍ତ୍ତନ କରିପାରିଲା ନାହିଁ: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ସ୍ଥାନୀୟ ଫାଇଲ ତନ୍ତ୍ର"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ବ୍ୟବହାର ବିଧି: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "କେହିନୁହଁ"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ଫାଇଲ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "ଆକାର"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ଚାଳକ"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "ଶ୍ରେଣୀ"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "ତାରିଖ ସମୟ"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attribs"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "ଅବରୋହୀ"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ଆରୋହୀ"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "ସାଧାରଣ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "ପ୍ରଗ୍ରାମ ଦେଖନ୍ତୁ:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -402,27 +402,27 @@ msgstr ""
 "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରଗ୍ରାମ ଫାଇଲଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ ବ୍ୟବହୃତ ହୋଇଥାଏ। ଯଦି ଏହା ଖାଲି ଥାଏ, ତେବେ "
 "ଆଭ୍ୟନ୍ତରୀଣ ଫାଇଲ ପ୍ରଦର୍ଶକକୁ ବ୍ୟବହାର କରାଯିବ"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "ପ୍ରଗ୍ରାମକୁ ସମ୍ପାଦନ କରନ୍ତୁ:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ଏହି ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରଗ୍ରାମକୁ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇଥାଏ।"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "ସର୍ବଧିକ ଲଗ ୱିଣ୍ଡୋ ଆକାର:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ ସଂଯୋଗିକୀ ପାଇଁ ଲଗ ୱିଣ୍ଡୋର ସର୍ବାଧିକ ଆକାର ବାଇଟରେ"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "ସୁଦୂର ବର୍ଣ୍ଣମାଳା ସେଟଗୁଡ଼ିକ:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -430,194 +430,201 @@ msgstr ""
 "ଦୂରବର୍ତ୍ତୀ ସଂଦେଶଗୁଡିକୁ ଚଳିତ ଘଟଣାସ୍ଥଳରେ ବଦଳାଇବାକୁ ଚେଷ୍ଟା କରିବା ପାଇଁ ଏହା କମା ଦ୍ବାରା ଅଲଗା "
 "କରାହୋଇଥିବା ଏକ ଅକ୍ଷରସେଟ୍ ଗୁଡିକର ତାଲିକା"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "ସୁଦୂର LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ର ମୂଲ୍ୟ। ଏହା ଡିରେକ୍ଟୋରୀ ସଂରଚନାରେ "
-"ତାରିଖଗୁଡ଼ିକୁ ସଠିକ ଭାବରେ ବିଶ୍ଳେଷଣ କରିବା ପାଇଁ କରାହୋଇଛି।"
+"ଏହା ହେଉଛି ସୁଦୀର ସାଇଟ ପାଇଁ LC_TIME ର ମୂଲ୍ୟ। ଏହା ଡିରେକ୍ଟୋରୀ ସଂରଚନାରେ ତାରିଖଗୁଡ଼ିକୁ ସଠିକ "
+"ଭାବରେ ବିଶ୍ଳେଷଣ କରିବା ପାଇଁ କରାହୋଇଛି।"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "କ୍ୟାଶେ TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "କ୍ୟାଶେ ପ୍ରବେଶଗୁଡିକ ଅବସାନ ହେବା ପୂର୍ବରୁ ସେଗୁଡିକୁ ରଖିବା ପାଇଁ ସେକେଣ୍ଡ ସଂଖ୍ଯା"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣକୁ ଯୋଡ଼ନ୍ତୁ"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ନୂତନ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣକୁ ସ୍ଥିତବାନ ସହିତ ଯୋଡ଼ନ୍ତୁ"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ଏକ ସମୟରେ କେବଳ ଗୋଟିଏ ସ୍ଥାନାନ୍ତରଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ଏକ ସମୟରେ କେବଳ ଗୋଟିଏ ସ୍ଥାନାନ୍ତରଣ କରିବେ କି?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନବଲିଖନ କରନ୍ତୁ"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "ଫାଇଲ୍‌ଗୁଡିକୁ ଡିଫଲଟ୍ ଦ୍ବାରା ଓଭର୍‌ରାଇଟ୍ କର କିମ୍ବା ଫାଇଲ୍ ସ୍ଥାନାନ୍ତରଣ ଚାଲୁ ରଖିବାପାଇଁ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ଫାଇଲ ଅନୁମତିଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "ସ୍ଥାନାନ୍ତରିତ ଫାଇଲଗୁଡ଼ିକର ଫାଇଲ ଅନୁମତିଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ଫାଇଲ ସମୟକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "ସ୍ଥାନାନ୍ତରିତ ଫାଇଲଗୁଡ଼ିକର ଫାଇଲ ସମୟକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ପ୍ରତ୍ୟେକ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ପରେ ସତେଜନ କରନ୍ତୁ"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ପ୍ରତ୍ୟେକ ଫାଇଲ ସ୍ଥାନାନ୍ତରିତ ହୋଇସାରିବା ପରେ ତାଲିକା ବାକ୍ସକୁ ସତେଜନ କରନ୍ତୁ"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀଗୁଡ଼ିକୁ ପ୍ରଥମେ ସଜାଡ଼ନ୍ତୁ"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "ପ୍ରଥମେ ଫାଇଲଗୁଡ଼ିକୁ ରଖନ୍ତୁ ଏବଂ ତାପରେ ଡ଼ିରେକ୍ଟୋରୀଗୁଡ଼ିକୁ"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "ଲୁକ୍କାଇତ ଫାଇଲଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "ଲୁକ୍କାଇତ ଫାଇଲଗୁଡ଼ିକୁ ତାଲିକା ବାକ୍ସରେ ଦର୍ଶାନ୍ତୁ"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "ଶୀର୍ଷକରେ ପରିବହନ ସ୍ଥିତି ଦର୍ଶାନ୍ତୁ"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "ଶୀର୍ଷକପଟିରେ ଫାଇଲ ପରିବହନ ସ୍ଥିତି ଦର୍ଶାନ୍ତୁ"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ଫାଇଲ ପରିବହନ ଆରମ୍ଭ କରନ୍ତୁ"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "ଫାଇଲ ପରିବହନକୁ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଆରମ୍ଭ କରନ୍ତୁ"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI ରେ ହସ୍ତକୃତ ନିର୍ଦ୍ଦେଶଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI ରେ ହସ୍ତକୃତ ନିର୍ଦ୍ଦେଶକୁ ଭରଣ କରିବା ପାଇଁ ଅନୁମତି ଦେଇଥାଏ (ପାଠ୍ୟ ସଂଯୋଗିକୀ ପରି ଫଳନଗୁଡ଼ିକ)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "ଅନ୍ତିମ ଡ଼ିରେକ୍ଟୋରୀକୁ ମନେ ରଖନ୍ତୁ"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "ପ୍ରୟୋଗ ବନ୍ଦ ହେବା ସମୟରେ ଅନ୍ତିମ ସ୍ଥାନୀୟ ଏବଂ ସୁଦୂର ଡିରେକ୍ଟୋରୀକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "ଆରମ୍ଭରେ ସୁଦୂର ସର୍ଭର ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "ପ୍ରୟୋଗ ଆରମ୍ଭ ହେବା ସମୟରେ ସୁଦୂର ସର୍ଭରକୁ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୁକ୍ତ କରନ୍ତୁ।"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "ନେଟୱର୍କ"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "ନେଟୱର୍କ ସମୟ ସମାପ୍ତ:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "ନେଟ୍ଉଆର୍କ ଇନପୁଟ୍ / ଆଉଟପୁଟ ପାଇଁ ଟାଇମଆଉଟ(ସମଯ ସମାପ୍ତି) ଅପେକ୍ଷାରତ । ଏହା ଏକ ନିରର୍ଥକ ସମୟସମାପ୍ତ "
 "ନୁହଁ।"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "ସଂଯୋଗ ପୁନଃ ପ୍ରୟାସ:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "ପ୍ରୟାସ କରିବାକୁ ସ୍ଥିର ହୋଇଥିବା ସ୍ୱୟଂ-ପ୍ରଚେଷ୍ଟା ସଂଖ୍ୟା। ସୀମାହୀନ ପୁନଃପ୍ରୟାସ ପାଇଁ ଏହାକୁ 0 ସେଟ କରନ୍ତୁ"
+msgstr ""
+"ପ୍ରୟାସ କରିବାକୁ ସ୍ଥିର ହୋଇଥିବା ସ୍ୱୟଂ-ପ୍ରଚେଷ୍ଟା ସଂଖ୍ୟା। ସୀମାହୀନ ପୁନଃପ୍ରୟାସ ପାଇଁ ଏହାକୁ 0 ସେଟ "
+"କରନ୍ତୁ"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "ଶୁପ୍ତ ସମୟକୁ ପୁନଃ ପ୍ରଚେଷ୍ଟା କରନ୍ତୁ:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "ପୁନଃ ପ୍ରଚେଷ୍ଟା ମଧ୍ଯରେ ଅପେକ୍ଷା କରିବାକୁ ହେଉଥିବା ସମୟ ସେକଣ୍ଡରେ"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "ସର୍ବାଧିକ KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "ଫାଇଲ ପରିବହନ ପାଉଥିବା ସର୍ବାଧିକ KB/S। (ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ 0 ସେଟ କରାଯ।ଇଥାଏ)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "ବ୍ଲକ ଆକାର ପରିବହନ କରନ୍ତୁ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr ""
-"ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ କରିବା ସମୟରେ ବ୍ୟବହୃତ ବ୍ଲକ ଆକାର। ଏହା 1024 ର ଗୁଣାତ୍ମକ "
-"ହେବା ଉଚିତ।"
+msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ କରିବା ସମୟରେ ବ୍ୟବହୃତ ବ୍ଲକ ଆକାର। ଏହା 1024 ର ଗୁଣାତ୍ମକ ହେବା ଉଚିତ।"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରୋଟୋକଲ:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "ଏହା ବ୍ୟବହାର ହେବାକୁ ଥିବା ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରୋଟୋକଲକୁ ଉଲ୍ଲେଖ କରିଥାଏ"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 ସମର୍ଥନକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -626,27 +633,27 @@ msgstr ""
 "ହେବ ତାହାକୁ ଏହା ବ୍ଯାଖ୍ଯାକରେ। 0=ଫାଇଲ୍ ଦେଖନ୍ତୁ 1=ଫାଇଲ୍ ସଂପାଦନା କରନ୍ତୁ 2=ଫାଇଲ୍ ସ୍ଥାନାନ୍ତରିତ "
 "କରନ୍ତୁ"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ସ୍ଥାନୀୟ ଫାଇଲଗୁଡ଼ିକର ତାଲିକା ବାକ୍ସର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଓସାର"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "ସୁଦୂର ଫାଇଲଗୁଡ଼ିକର ତାଲିକା ବାକ୍ସର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଓସାର"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ସ୍ଥାନୀୟ/ସୁଦୂର ଫାଇଲଗୁଡ଼ିକର ତାଲିକା ବାକ୍ସର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "ପରିବହନ ତାଲିକା ବାକ୍ସର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "ଲଗିଙ୍ଗ ୱିଣ୍ଡୋର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା"
 
-#: ../lib/options.h:177
+#: 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."
@@ -654,15 +661,15 @@ msgstr ""
 "ସ୍ଥାନାନ୍ତରଣ ଉଇଣ୍ଡୋରେ ଫାଇଲ୍ ନାମ ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ "
 "ଏହାକୁ 0 ରେ ସେଟ୍ କରନ୍ତୁ।"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ସଜାଡ଼ିବା ପାଇଁ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସ୍ତମ୍ଭ"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ଛୋଟରୁ ବଡ଼ କିମ୍ବା ବଡ଼ରୁ ଛୋଟ ଆକାରରେ ସଜାଡ଼ନ୍ତୁ"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -670,7 +677,7 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ଫାଇଲ୍ ନାମ ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ "
 "ଏହାକୁ 0 ରେ ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -678,7 +685,7 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ଆକାର ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ ଏହାକୁ 0 "
 "ରେ ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -686,7 +693,7 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ଉପୟୋଗକର୍ତ୍ତା ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ "
 "ଏହାକୁ 0 ରେ ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -694,7 +701,7 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ସମୂହ ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ ଏହାକୁ 0 "
 "ରେ ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -702,7 +709,7 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ତାରିଖ ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ ଏହାକୁ 0 "
 "ରେ ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -710,185 +717,185 @@ msgstr ""
 "ଫାଇଲ୍‌ ତାଲିକା ବକ୍ସରେ ଗୁଣ ସ୍ତମ୍ଭର ଓସାର। ଏହି ସ୍ତମ୍ଭ ସ୍ବୟଂଚାଳିତ ରୂପେ ପୁନଃଆକାର ହେବାକୁ ଏହାକୁ 0 ରେ "
 "ସେଟ୍ କରନ୍ତୁ। ଏହି ସ୍ତମ୍ଭକୁ ଅକ୍ଷମ କରିବାକୁ ଏହାକୁ -1ରେ ସେଟ୍ କରନ୍ତୁ"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "ସର୍ଭର ପାଖକୁ ପଠାଯାଉଥିବା ଆଦେଶଗୁଡିକର ରଙ୍ଗ"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "ସର୍ଭର ପାଖରୁ ମିଳୁଥିବା ଆଦେଶଗୁଡିକର ରଙ୍ଗ"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ତ୍ରୁଟି ସନ୍ଦେଶଗୁଡ଼ିକର ରଙ୍ଗ"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "ବଳକା ଲଗ ସନ୍ଦେଶଗୁଡ଼ିକର ରଙ୍ଗ"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "ସ୍ଥାନୀୟ"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନ"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ଫାଇଲ ପରିବହନକୁ %.2f KB/s କରାଯାଇଛି\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME କୁ '%s' ରେ ସେଟ କରିବା ସମୟରେ ତ୍ରୁଟି। '%s' କୁ ଫେରି ଆସିଲା\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "ଡିରେକ୍ଟୋରୀ ତାଲିକା %s କୁ କ୍ୟାଶେରୁ ଧାରଣ କରୁଅଛି (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀ ତାଲିକା %s କୁ ସର୍ଭର (LC_TIME=%s)ରୁ ଧାରଣ କରାଯାଉଛି\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr ""
-"ଚେତାବନୀ: ଫାଇଲ '%s' ର ପଥ ବନ୍ଦ କରୁଅଛି। ଖଣ୍ଡ ବିଖଣ୍ଡ ପଥ (%s) ପ୍ରଚଳିତ ଡିରେକ୍ଟୋରୀ (%s) "
-"ସହିତ ମେଳଖାଉନାହିଁ\n"
+"ଚେତାବନୀ: ଫାଇଲ '%s' ର ପଥ ବନ୍ଦ କରୁଅଛି। ଖଣ୍ଡ ବିଖଣ୍ଡ ପଥ (%s) ପ୍ରଚଳିତ ଡିରେକ୍ଟୋରୀ (%s) ସହିତ "
+"ମେଳଖାଉନାହିଁ\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ତ୍ରୁଟି: କ୍ୟାଶେରେ ଲେଖାଯାଇପାରିବ ନାହିଁ: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ତ୍ରୁଟି: ଚିହ୍ନିତ ସ୍ଥାନ %s କୁ ଖୋଜିପାଇଲା ନାହିଁ\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନ ତ୍ରୁଟି: ଚିହ୍ନିତ ସ୍ଥାନ ଭରଣ %s ରେ ଆଧାର ନାମ ନାହିଁ\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "ପ୍ରଟୋକଲ '%s' ଟି ବର୍ତ୍ତମାନ ସମର୍ଥିତ ନୁହଁ।\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "ପୁନଃପୌନିକ ସାଙ୍କେତିକ ସଂଯୋଗ %s ମିଳିଛି\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "ତୃଟି: ଦୂରବର୍ତ୍ତୀ ସାଇଟ୍ %s ବିଚ୍ଛେଦ ହୋଇଛି । ଅଧିକାଂଶ ପୁନଃଚେଷ୍ଟାସବୁ ପହଞ୍ଚିଛି...ତ୍ଯାଗ କରୁଛି\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "ତୃଟି: ଫ୍ଲାଗ୍‌ରେ ବନ୍ଦ ସେଟ୍ କରି ପାରୁ ନାହିଁ: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "ମୂଖ୍ୟ pty %s କୁ ଖୋଲିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ସକେଟ ଯୁଗଳକୁ ନିର୍ମାଣ କରିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ତ୍ରୁଟି: sshକୁ ନିଷ୍ପାଦନ କରିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "ଅନ୍ୟ ଏକ ପଦ୍ଧତିକୁ ଆଗପଛ କରିପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ପ୍ରକ୍ସି ଆଧାର ନାମ:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ଅଗ୍ନିକବଚ ଆଧାର ନାମ"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "ପ୍ରକ୍ସି ସଂଯୋଗିକୀ:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ଅଗ୍ନିକବଚ ସହିତ ସଂଯୋଗ କରିବାକୁ ଥିବା ସଂଯୋଗିକୀ"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "ପ୍ରୋକ୍ସି ଚାଳକ ନାମ:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ଆପଣଙ୍କର ଅଗ୍ନିକବଚ ଚାଳକ ନାମ"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ପ୍ରୋକ୍ସି ପ୍ରବେଶ ସଂକେତ:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ଆପଣଙ୍କର ଅଗ୍ନିକବଚ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 କୁ ବ୍ଯବହାର କରନ୍ତୁ"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -897,65 +904,65 @@ msgstr ""
 "ସର୍ଭରରୁ ଭୁଲ୍ ଉତ୍ତର ମିଳିଛି, ବିଚ୍ଛିନ୍ନ ହେଉଛି\n"
 "ଅମାନ୍ଯ ଅଂଶ ଆକାର '%s' ଦୂରବର୍ତ୍ତୀ ସର୍ଭର ଦ୍ବାରା ଫେରାଇ ଦିଆଯାଇଛି\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "offset ରେ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ କରାଯାଇଛି"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ଫାଇଲ୍ %s କୁ ପୁନରୁଦ୍ଧାର କରି ପାରୁ ନାହିଁ\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ବିବରଣୀ ପଞ୍ଜିକା ତାଲିକାଭୁକ୍ତ କରିବା ପୁନରୁଦ୍ଧାର କରୁଛି...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ସର୍ଭରରୁ ଭୁଲ ଉତ୍ତର ମିଳିଛି, ବିଚ୍ଛିନ୍ନ ହେଉଛି\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE ଆଦେଶ"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host ସଂଯୋଗିକୀ"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP ପ୍ରୋକ୍ସି"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "ଇଚ୍ଛାରୂପଣ"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ଇମେଲ ଠିକଣା:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -963,19 +970,19 @@ msgstr ""
 "ଯେତେବେଳେ ବି ଆପଣ ଏକ ଦୂରବର୍ତ୍ତୀ FTP ସର୍ଭରରେ ବେନାମୀ ହିସାବରେ ଲଗ୍ କରୁଛନ୍ତି, ସେତେବେଳେ ଏହା "
 "ହେଉଛି ସେହି ପ୍ରବେଶ ସଂକେତ ଯାହାକୁ ବ୍ଯବହାର କରାଯିବ "
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "ପ୍ରୋକ୍ସି ଖାତା:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ଆପଣଙ୍କର ଅଗ୍ନିକବଚ ଖାତା (ବୈକଳ୍ପିକ)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "ପ୍ରୋକ୍ସି ସର୍ଭର ପ୍ରକାର:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -991,26 +998,26 @@ msgstr ""
 "(ଉପଯୋଗକର୍ତ୍ତା), p (ପାସ), h (ହୋଷ୍ଟ), o (ପୋର୍ଟ) କିମ୍ବା a (ଏକାଉଣ୍ଟ) ହୋଇପାରେ। ଉଦାହରଣ "
 "ସ୍ବରୂପ, ପ୍ରୋକ୍ସି ଉପୟୋଗକର୍ତ୍ତାକୁ ନିର୍ଦ୍ଦିଷ୍ଟ କରିବା ପାଇଁ, ଆପଣ %pu ରେ ଟାଇପ କରି ପାରିବେ"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ଠିକଣାକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"ଯଦି ଏହାକୁ ସକ୍ରିୟ କରାଯାଏ, ତେବେ ସୁଦୂର FTP ସର୍ଭରର PASV IP ଠିକଣା କ୍ଷେତ୍ରକୁ ଅଗ୍ରାହ୍ୟ "
-"କରାଯିବ ଏବଂ ହୋଷ୍ଟର IP ଠିକଣାକୁ ତାହା ପରିବର୍ତ୍ତେ ବ୍ୟବହାର କରାଯିବ। ଏହା ପ୍ରାୟତଃ ରାଉଟର ପାଇଁ "
-"ତାହାର ବାହ୍ୟ IP ଠିକଣା ପାଇଁ PASV ଉତ୍ତରରେ ଆବଶ୍ୟକ ହୋଇଥାଏ।"
+"ଯଦି ଏହାକୁ ସକ୍ରିୟ କରାଯାଏ, ତେବେ ସୁଦୂର FTP ସର୍ଭରର PASV IP ଠିକଣା କ୍ଷେତ୍ରକୁ ଅଗ୍ରାହ୍ୟ କରାଯିବ ଏବଂ "
+"ହୋଷ୍ଟର IP ଠିକଣାକୁ ତାହା ପରିବର୍ତ୍ତେ ବ୍ୟବହାର କରାଯିବ। ଏହା ପ୍ରାୟତଃ ରାଉଟର ପାଇଁ ତାହାର ବାହ୍ୟ IP "
+"ଠିକଣା ପାଇଁ PASV ଉତ୍ତରରେ ଆବଶ୍ୟକ ହୋଇଥାଏ।"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "ନିଷ୍କ୍ରିୟ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣଗୁଡିକ"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1025,11 +1032,11 @@ msgstr ""
 "ଆପଣ ସଂଯୁକ୍ତ ନ ହୋଇଛନ୍ତି। ଯଦି ଏହା ଅକ୍ଷମ କରାହୁଏ, ତେବେ gFTP କ୍ଳାଏଣ୍ଟ ପାର୍ଶ୍ବରେ ଏକ ସଂଯୋଗିକୀ "
 "ଖୋଲିବ ଏବଂ ଦୂରବର୍ତ୍ତୀ ସର୍ଭର ଏହାକୁ ସଂଯୋଗ କରିବା ପାଇଁ ଚେଷ୍ଟା କରିବ।"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "ଦୂରବର୍ତ୍ତୀ ସିମଲିଙ୍କ ଗୁଡିକୁ ସମାଧାନ କରନ୍ତୁ (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1040,15 +1047,16 @@ msgstr ""
 "ସାଧାରଣତଃ, ସକ୍ଷମ କରି ଛାଡିଦେବା ଏକ ଉତ୍ତମ ଧାରଣା। ଆପଣ ଏହାକୁ ଅକ୍ଷମ କରିବାପାଇଁ ଚାହୁଁଥିବା ସମୟ "
 "ହେଉଛି ଯେତେବେଳେ ଦୂରବର୍ତ୍ତୀ FTP ସର୍ଭର LISTରେ L ବିକଳ୍ପକୁ ସମର୍ଥନ କରେ ନାହିଁ"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII ପ୍ରକାରରେ ଫାଇଲ ଗୁଡିକୁ ସ୍ଥାନାନ୍ତର କରନ୍ତୁ"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1057,330 +1065,322 @@ msgstr ""
 "ପ୍ରଦର୍ଶନ କରିଥାଏ। ଯଦି ଆପଣ UNIXରୁ UNIXକୁ ସ୍ଥାନାନ୍ତରିତ କରୁଛନ୍ତି, ତେବେ ଏହାକୁ ତ୍ଯାଗ କରିବା ନିରାପଦ। "
 "ଯଦି ଆପଣ ଦ୍ୱିମିକ ତଥ୍ଯ ଆହରଣ କରୁଛନ୍ତି, ତେବେ ଆପଣ ଏହାକୁ ଅକ୍ଷମ କରିବା ପାଇଁ ଚାହିଁବେ।"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ଏକ ତଥ୍ଯ ସଂଯୋଗ ସୃଷ୍ଟି କରି ପାରୁ ନାହିଁ: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ଏକ ସଂଯୋଗିକୀ ବାନ୍ଧି ପାରୁ ନାହିଁ: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "ଗୋଟିଏ IPv6 ସକେଟ ନିର୍ମାଣ କରିବାରେ ବିଫଳ: %s\n"
 
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "ଅମାନ୍ଯ EPSV ପ୍ରତିକ୍ରିୟା '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ସ୍ଥାନୀୟ ସକେଟର ଠିକଣା ପାଇ ପାରୁ ନାହିଁ:%s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ସର୍ଭରରୁ ସଂଯୋଗ ସ୍ବୀକାର କରି ପାରୁ ନାହିଁ: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ସର୍ବମୋଟ"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "ସକେଟ ଫ୍ଲାଗଗୁଡିକୁ ପାଇ ପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "ଅଣ-ଅବରୋଧ ସହିତ ସକେଟ ସେଟ କରି ପାରିବେ ନାହିଁ: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH ପ୍ରୋଗ୍ରାମ ନାମ:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "କାର୍ଯ୍ୟକାରୀ ହେବା ଯୋଗ୍ଯ SSH କୁ ପଥ"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH ଅତିରିକ୍ତ ପାରାମଗୁଡିକ:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH ପ୍ରୋଗ୍ରାମ ନିକଟକୁ ଯିବାକୁଥିବା ଅତିରିକ୍ତ ପ୍ରାଚଳଗୁଡ଼ିକ"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ଚାଳକ/ପାସ ଦରକାର କରେ"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH ସଂଯୋଗଗୁଡିକ ପାଇଁ ଏକ ଚାଳକ/ଗୁପ୍ତଶବ୍ଦ ଦରକାର କରେ"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "ପ୍ରୋଗ୍ରାମ %s ଚାଲୁଅଛି\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA କି ପାଇଁ ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "କି ପାଇଁ ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE ଭରଣ କରନ୍ତୁ:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତକୁ ଭରଣ କରନ୍ତୁ"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ତୃଟି: ଏକ ଭୁଲ ପ୍ରବେଶ ସଙ୍କେତ ପ୍ରବିଷ୍ଟ କରାଯାଇଥିଲା\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: ପ୍ରୋଟୋକଲ ଆରମ୍ଭ କାର୍ୟ୍ଯ\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: ପ୍ରୋଟୋକଲ ରୂପାନ୍ତର %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d:%s ଖୋଲନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: ବନ୍ଦ କରନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: ବିବରଣୀ ପଞ୍ଜିକା %s ଖୋଲନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ବିବରଣୀ ପଞ୍ଜିକା ପଢନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ଫାଇଲ %s ହଟାନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: ବିବରଣୀ ପଞ୍ଜିକା %s ତିଆରି କରନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ବିବରଣୀ ପଞ୍ଜିକା %s ହଟାନ୍ତୁ\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: ପ୍ରକୃତପଥ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ଫାଇଲ ଗୁଣଧର୍ମ\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: ଆରମ୍ଭ %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "ଏପରି କୌଣସି ଫାଇଲ କିମ୍ବା ଡିରେକ୍ଟୋରୀ ନାହିଁ"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "ଅନୁମତି ଅସ୍ବୀକୃତ"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ବିଫଳତା"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ଖରାପ ସଂଦେଶ"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "ସଂଯୋଗ ନାହିଁ"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "ସଂଯୋଗ ନଷ୍ଟହେଲା"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "ପ୍ରୟୋଗ ସମର୍ଥିତ ନୁହଁ"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "ସର୍ଭରଠାରୁ ଅଜ୍ଞାତ ସଂଦେଶ ଫେରି ଆସିଲା"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ତୃଟି: ସଂଦେଶ ଆକାର %d ବହୁତ ବଡ\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1388,41 +1388,41 @@ msgstr ""
 "ଦୂରବର୍ତ୍ତୀ ସର୍ଭର ସାଙ୍ଗରେ  ଏକ SSH ସଂୟୋଗ ଆରମ୍ଭ କରିବା ସମଯରେ ତୃଟି ଥିଲା। ଦୂରବର୍ତ୍ତୀ ସର୍ଭର ଠାରୁ "
 "ତୃଟି ସଂଦେଶ ଆଗରେ ଆସୁଛି:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s ପାଖକୁ  SSH ସଂଯୋଗ ଖୋଲୁଛି\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH ସର୍ଭର %s ରେ ସଫଳତା ପୂର୍ବକ ଲଗ ହେଲା\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL ଯନ୍ତ୍ର"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL ଏନଟ୍ରୋପି ଫାଇଲ:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL ଏଣ୍ଟ୍ରପି ଫାଇଲ"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "ଏନଟ୍ରୋପି ସିଡ ଦୈର୍ଘ୍ଯ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL ଯନ୍ତ୍ରକୁ ସିଡ କରିବାକୁ ସର୍ବାଧିକ ସଂଖ୍ଯକ ବାଇଟ"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL ସାଥୀକୁ ଯାଞ୍ଚ କରନ୍ତୁ"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1435,11 +1435,11 @@ msgstr ""
 "ବିଷୟ = %s\n"
 "ତୃଟି %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "ସାଥୀ ପ୍ରମାଣପତ୍ର ପାଇ ପାରିବେ ନାହିଁ\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1448,45 +1448,45 @@ msgstr ""
 "ERROR: SSL ପ୍ରମାଣପତ୍ର (%s)ରେ ଥିବା ହୋଷ୍ଟ ଆମେ ସଂୟୁକ୍ତ ହୋଇଥିବା ହୋଷ୍ଟ (%s) ସହିତ ମେଳ ହେଉନି। "
 "ସଂଯୋଗ ବୃଥା ହେଉଛି।\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL ଲାଇବ୍ରେରୀକୁ ଆରମ୍ଭ କରିପାରିବେ ନାହିଁ\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "ତୃଟି ଧାରଣ କରୁଥିବା ପୂର୍ବନିର୍ଦ୍ଧାରିତ SSL ପ୍ରମାଣପତ୍ରଗୁଡିକ\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "ତୃଟି ସେଟ କରୁଥିବା ସାଇଫର ତାଲିକା (କୌଣସି ମାନ୍ଯ ସାଇଫର ନାହିଁ):\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ତୃଟି: SSL ଯନ୍ତ୍ର ଆରମ୍ଭ କରାଯାଇ ନ ଥିଲା\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "ତୃଟି SSL ସଂଯୋଗ ସେଟ କରୁଛି (BIO ବସ୍ତୁ)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "ତୃଟି SSL ସଂଯୋଗ ସେଟ କରୁଛି (SSL ବସ୍ତୁ)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ସାଥୀ ପ୍ରମାଣପତ୍ରରେ ତୃଟି: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "କାର୍ଯ୍ୟ ରଦ୍ଦ କରାଗଲା\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "ପୁଣି ସଂଯୋଗ କରିବାକୁ ଚେଷ୍ଟା ନ କରିବା ପର୍ଯ୍ୟନ୍ତ %d ସେକେଣ୍ଡ ଅପେକ୍ଷା କରିଛି\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1496,73 +1496,73 @@ msgstr ""
 "ମୁକ୍ତ ସଫ୍ଟୱେର ଅଟେ, ଏବଂ ତୁମକୁ ନିର୍ଦ୍ଦିଷ୍ଟ ସର୍ତ୍ତଗୁଡିକ ଅନ୍ତର୍ଗତ ପୁନଃବଣ୍ଟନ ପାଇଁ ସ୍ବାଗତ କରାହେଉଛି; "
 "ବିସ୍ତୃତ ବିବରଣୀ ପାଇଁ, COPYING ଫାଇଲ ଦେଖନ୍ତୁ\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri redhat com>"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: ପୁନଃନାମକରଣ <ପୁରୁଣା ନାମ> <ନୂତନ ନାମ>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: ବିଲୋପ କରନ୍ତୁ <ଫାଇଲ>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: rmdir <ଡ଼ିରେକ୍ଟୋରୀ>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: mkdir <ନୂତନ ଡ଼ିରେକ୍ଟୋରୀ>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: chdir <ଡ଼ିରେକ୍ଟୋରୀ>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "ଅମାନ୍ଯ ଯୁକ୍ତିତର୍କ\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ବିବରଣୀ ପଞ୍ଜିକା କ୍ୟାଶେକୁ ପରିଷ୍କାର କରନ୍ତୁ\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ବ୍ୟବହାର ବିଧି: ଖୋଲନ୍ତୁ "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ବ୍ୟବହାର ବିଧି: [ପରିବର୍ତ୍ତନଶୀଳ = ମୂଲ୍ଯ] ସେଟ କରନ୍ତୁ\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ତୃଟି: ପରିବର୍ତ୍ତନଶୀଳ %s ଏକ ମାନ୍ଯ ବିନ୍ୟାସ ପରିବର୍ତ୍ତନଶୀଳ ନୁହଁ।\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1570,321 +1570,323 @@ msgstr ""
 "ସମର୍ଥିତ ଆଦେଶଗୁଡିକ:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ବ୍ୟବହାର ବିଧି: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "ବିବରଣୀ"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP ସୂଚନା ଦର୍ଶାଇଥାଏ"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "ଚଳିତ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ପ୍ରକାରକୁ Ascii ରେ ସେଟ କରେ (କେବଳ FTP ପାଇଁ)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ଦ୍ୱିମିକ"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "ଚଳିତ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ପ୍ରକାରକୁ ଦ୍ୱମିକରେ ସେଟ କରେ (କେବଳ FTP ପାଇଁ)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "ଦୂରବର୍ତ୍ତୀ କାର୍ଯ୍ୟଶୀଳ ଡ଼ିରେକ୍ଟୋରୀକୁ ପରିବର୍ତ୍ତନ କରେ"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ଫାଇଲ୍‌ର ଅନୁମତିଗୁଡିକୁ ପରିବର୍ତ୍ତନ କରେ"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "ପରିଷ୍କାର କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ଉପଲବ୍ଧ ବିକଳ୍ପଗୁଡିକ: କ୍ୟାଶେ"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "ବନ୍ଦ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "ଦୂରବର୍ତ୍ତୀ ସାଇଟରୁ ବିଚ୍ଛିନ୍ନ କରେ"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "ବିଲୋପ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ଫାଇଲ ହଟାଏ"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "ଚଳିତ ଦୂରବର୍ତ୍ତୀ ବିବରଣୀ ପଞ୍ଜିକା ପାଇଁ ବିବରଣୀ ପଞ୍ଜିକା ତାଲିକା ଦେଖାଏ"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "ଗ୍ରହଣ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "ଦୂରବର୍ତ୍ତୀ ଫାଇଲ(ଗୁଡିକୁ) ଆହରଣ କରିଥାଏ"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "ସହାୟତା"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "ଏହି ସହାୟତା ପରଦାକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "ସ୍ଥାନୀୟ ବିବରଣୀ ପଞ୍ଜିକାକୁ ପରିବର୍ତ୍ତନ କରିଥାଏ "
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "ସ୍ଥାନୀୟ ଫାଇଲର ଅନୁମତି ଗୁଡିକ ପରିବର୍ତ୍ତନ କରିଥାଏ"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ବିଲୋପ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ଗୋଟିଏ ସ୍ଥାନୀୟ ଫାଇଲକୁ ହଟାଇଥାଏ"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "ଚଳିତ ସ୍ଥାନୀୟ ବିବରଣୀ ପଞ୍ଜିକା ପାଇଁ ବିବରଣୀ ପଞ୍ଜିକା ତାଲିକା ଦେଖାଏ"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "ଏକ ସ୍ଥାନୀୟ ବିବରଣୀ ପଞ୍ଜିକା ସୃଷ୍ଟି କରେ"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "ଚଳିତ ସ୍ଥାନୀୟ ବିବରଣୀ ପଞ୍ଜିକା ଦେଖାଅ"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "ଗୋଟିଏ ସ୍ଥାନୀୟ ଫାଇଲକୁ ପୁନଃନାମକରଣ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ଏକ ସ୍ଥାନୀୟ ବିବରଣୀ ପଞ୍ଜିକାକୁ ହଟାନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ବିବରଣୀ ପଞ୍ଜିକା ସୃଷ୍ଟି କରିଥାଏ"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "ସ୍ଥାନୀୟ ଫାଇଲ(ଗୁଡିକ) ଧାରଣ କରିଥାଏ"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "ଖୋଲନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ସାଇଟ ସହିତ ସଂଯୋଗ ଖୋଲିଥାଏ"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "ରଖନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "ଚଳିତ ଦୂରବର୍ତ୍ତୀ ବିବରଣୀ ପଞ୍ଜିକା ଦେଖାନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "ମୁକ୍ତ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTPରୁ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "ପୁନଃନାମକରଣ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ଫାଇଲକୁ ପୁନଃନାମକରଣ କରନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ଏକ ଦୂରବର୍ତ୍ତୀ ବିବରଣୀ ପଞ୍ଜିକା ହଟାଅ"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr "ବିନ୍ୟାସ ଫାଇଲ ଚଳଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ। ଆପଣ ମଧ୍ଯ ଚଳଗୁଡ଼ିକୁ set var=val ଦ୍ବାରା ସେଟ କରି ପାରିବେ"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "ସାଇଟ"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "ଗୋଟିଏ ସାଇଟ ନିର୍ଦ୍ଦିଷ୍ଟ ନିର୍ଦ୍ଦେଶ ଚଲାନ୍ତୁ"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ତୃଟି: ଆଦେଶକୁ ଚିହ୍ନିହେଉନାହିଁ\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ଆଧାର %s ରେ ଫାଇଲ %sକୁ ବାଦଦେଇ\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "ଆଧାର %sରେ ସ୍ଥାନାନ୍ତରଣ ବନ୍ଦ ହେଉଛି\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s ରୁ %s ଆହରଣ କରିପାରିଲା ନାହିଁ \n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"ସେଠାରେ %d ଟି ଫାଇଲ ଅଥବା ଡିରେକ୍ଟୋରୀ ଅଛି ଯାହାକୁକି ସ୍ଥାନାନ୍ତରିତ କରିହେବ ନାହିଁ। କେଉଁ ବସ୍ତୁଗୁଡ଼ିକ "
-"ସଠିକ ବାବରେ ସ୍ଥାନାନ୍ତରିତ ହୋଇନାହିଁ ତାହା ଯାଞ୍ଚ କରପିବା ପାଇଁ ଲଗ ଫାଇଲ ଦେଖନ୍ତୁ।"
+"ସେଠାରେ %d ଟି ଫାଇଲ ଅଥବା ଡିରେକ୍ଟୋରୀ ଅଛି ଯାହାକୁକି ସ୍ଥାନାନ୍ତରିତ କରିହେବ ନାହିଁ। କେଉଁ ବସ୍ତୁଗୁଡ଼ିକ ସଠିକ "
+"ବାବରେ ସ୍ଥାନାନ୍ତରିତ ହୋଇନାହିଁ ତାହା ଯାଞ୍ଚ କରପିବା ପାଇଁ ଲଗ ଫାଇଲ ଦେଖନ୍ତୁ।"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: ଅନ୍ଯ କିଛି କରିବା ପାଇଁ ଦୟାକରି ପ୍ରଥମେ ବନ୍ଦ ବଟନକୁ ହିଟ କରନ୍ତୁ\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଚଲାନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
-msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଯୋଗ କରନ୍ତୁ: ଆପଣ ନିଶ୍ଚିତ ରୂପେ ଚିହ୍ନିତ ସ୍ଥାନ ପାଇଁ ଏକ ନାମ ପ୍ରବିଷ୍ଟ କରିବା ଉଚିତ\n"
+msgstr ""
+"ଚିହ୍ନିତ ସ୍ଥାନକୁ ଯୋଗ କରନ୍ତୁ: ଆପଣ ନିଶ୍ଚିତ ରୂପେ ଚିହ୍ନିତ ସ୍ଥାନ ପାଇଁ ଏକ ନାମ ପ୍ରବିଷ୍ଟ କରିବା ଉଚିତ\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଯୋଗ କରନ୍ତୁ: ଚିହ୍ନିତ ସ୍ଥାନ %s ଯୋଗ କରାଯାଇ ପାରିବ ନାହିଁ କାରଣ ସେହି ନାମ ପୂର୍ବରୁ ଅଛି\n"
+msgstr ""
+"ଚିହ୍ନିତ ସ୍ଥାନକୁ ଯୋଗ କରନ୍ତୁ: ଚିହ୍ନିତ ସ୍ଥାନ %s ଯୋଗ କରାଯାଇ ପାରିବ ନାହିଁ କାରଣ ସେହି ନାମ ପୂର୍ବରୁ ଅଛି\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନ ଯୋଗ କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଯୋଗ କରନ୍ତୁ: ଆପଣ ନିଶ୍ଚିତ ରୂପେ ଏକ ହୋଷ୍ଟ ନାମ ପ୍ରବିଷ୍ଟ କରିବା ଉଚିତ\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1894,31 +1896,31 @@ msgstr ""
 "ଆପଣ ଏକ ଉପତାଲିକାରେ ଏକ / ଲଗାଇ ବସ୍ତୁଗୁଡ଼ିକୁ ଅଲଗା କରି ପାରିବେ\n"
 "(ଉଦାହରଣ :Linux ସାଇଟ/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "ପ୍ରବେଶ ସଂକେତକୁ ମନେ ରଖନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନ ପାଇଁ ଆପଣଙ୍କୁ ଗୋଟିଏ ନାମ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "ନୂତନ ଫୋଲଡ଼ର"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "ସୃଷ୍ଟି କରିବାକୁ ଥିବା ନୂତନ ଫୋଲଡରର ନାମ ପ୍ରବିଷ୍ଟ କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "ନୂତନ ବସ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "ସୃଷ୍ଟି କରିବାକୁ ଥିବା ନୂତନ ଆଇଟମ ର ନାମ ପ୍ରବିଷ୍ଟ କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1927,106 +1929,99 @@ msgstr ""
 "ଚିହ୍ନିତ ସ୍ଥାନ %s ଏବଂ ତାହାର ସମସ୍ତ ଉପଶାଖାଗୁଡ଼ିକୁ ଲିଭାଇବେ\n"
 "ବୋଲି ଆପଣ ନିଶ୍ଚିତ କି?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଅପସାରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "ଭରଣକୁ ସଂପାଦନା କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "ବର୍ଣ୍ଣନା:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ଆଧାର ନାମ:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "ସଂଯୋଗିକୀ:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "ପ୍ରୋଟୋକଲ:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "ଦୂରବର୍ତ୍ତୀ ଡ଼ିରେକ୍ଟୋରୀ: "
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ସ୍ଥାନୀୟ ଡ଼ିରେକ୍ଟୋରୀ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ଚାଳକ ନାମ:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "ଖାତା:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  ରଦ୍ଦକରନ୍ତୁ  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ଫାଇଲ (_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ଫାଇଲ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ଫାଇଲ/ନୂତନ ଫୋଲଡର (_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ଫାଇଲ/ନୂତନ ବସ୍ତୁ (_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ଫାଇଲ/ଅପସାରଣ କରନ୍ତୁ (_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ଫାଇଲ/ଗୁଣଧର୍ମ (_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ଫାଇଲ/ପୃଥକ କରନ୍ତୁ"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ଫାଇଲ/ବନ୍ଦ କରନ୍ତୁ (_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2034,91 +2029,90 @@ msgstr ""
 "ଆପଣ ବର୍ତ୍ତମାନ ଆପଣଙ୍କ ଫାଇଲ(ଗୁଡିକ)ର ଗୁଣଧର୍ମଗୁଡିକୁ ବ୍ଯବସ୍ଥା କରି ପାରିବେ\n"
 "ଟିପ୍ପଣୀ: ସମସ୍ତ ftp ସର୍ଭର chmod ବିଶେଷତାକୁ ସମର୍ଥନ କରନ୍ତି ନାହିଁ"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "ବିଶେଷ"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ଲଗା ହୋଇଥିବା"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ଚାଳକ"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "ପଢନ୍ତୁ"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "ଲେଖନ୍ତୁ"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ନିଷ୍ପାଦନ କରନ୍ତୁ"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "ସମୂହ"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "ଅନ୍ଯାନ୍ଯ"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "ଆପଣ ଏହି %ld ଫାଇଲ ଏବଂ %ld ଡ଼ିରେକ୍ଟୋରୀ ଗୁଡିକୁ ବିଲୋପ କରିବା ପାଇଁ ଚାହିଁବା ନିଶ୍ଚିତ ତ?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "ଏହି %ld ଫାଇଲଗୁଡ଼ିକୁ ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଷ୍ଚିତ କି"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "ଏହି %ld ଡିରେକ୍ଟୋରୀଗୁଡ଼ିକୁ ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ୍ଚିତ କି"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ଫାଇଲ/ଡ଼ିରେକ୍ଟୋରୀଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "ଅପସାରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "ସଂଯୋଗ କରନ୍ତୁ"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s ପ୍ରାପ୍ତ ହେଲା\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ଟାଣନ୍ତୁ-ଏବଂ-ଛାଡନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2126,468 +2120,455 @@ msgstr ""
 "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣସବୁ ପ୍ରଗତିରେ ଅଛି।\n"
 "ଆପଣ ଏହାକୁ ପ୍ରସ୍ଥାନ କରାଇବା ପାଇଁ ଚାହିଁବା ନିଶ୍ଚିତ ତ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "ଅବସ୍ଥାନ ଖୋଲନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "ସଂଯୋଗ କରିବା ପାଇଁ ଗୋଟିଏ URL ଭରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/FTP (_F)"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/ଛିଣ୍ଡାଅ"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/ୱିଣ୍ଡୋ 1 (_1)"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/ୱିଣ୍ଡୋ 2 (_2)"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/ପୃଥକ"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii (_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/ଦ୍ୱିମିକ (_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/ପସନ୍ଦଗୁଡ଼ିକ (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/ପ୍ରସ୍ଥାନ କରନ୍ତୁ (_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ସ୍ଥାନୀୟ (_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/ସ୍ଥାନୀୟ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/ସ୍ଥାନୀୟ/ଅବସ୍ଥାନ ଖୋଲନ୍ତୁ (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/ସ୍ଥାନୀୟ/ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ (_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/ସ୍ଥାନୀୟ/ପୃଥକ"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/ସ୍ଥାନୀୟ/Filespecକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/ସ୍ଥାନୀୟ/ବଚ୍ଛିତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/ସ୍ଥାନୀୟ/ସମସ୍ତଙ୍କୁ ବାଛନ୍ତୁ (_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/ସ୍ଥାନୀୟ/ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକୁ ଚୟନ କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/ସ୍ଥାନୀୟ/ସମସ୍ତଙ୍କୁ ଅବଛା କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/ସ୍ଥାନୀୟ/ଡ଼ିରେକ୍ଟାରୀ ତାଲିକାଭୁକ୍ତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/ସ୍ଥାନୀୟ/SITE ଆଦେଶ ପଠାନ୍ତୁ..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/ସ୍ଥାନୀୟ/ଡ଼ିରେକ୍ଟୋରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/ସ୍ଥାନୀୟ/ଅନୁମତିଗୁଡ଼ିକ (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ସ୍ଥାନୀୟ/ନୂତନ ଫୋଲଡର (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/ସ୍ଥାନୀୟ/ପୁନଃନାମକରଣ କରନ୍ତୁ (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/ସ୍ଥାନୀୟ/ଅପସାରଣ କରନ୍ତୁ (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/ସ୍ଥାନୀୟ/ସମ୍ପାଦନ କରନ୍ତୁ (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/ସ୍ଥାନୀୟ/ଦୃଶ୍ୟ (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/ସ୍ଥାନୀୟ/ସତେଜନ କରନ୍ତୁ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/ଦୂରବର୍ତ୍ତୀ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଅବସ୍ଥାନ ଖୋଲନ୍ତୁ (_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ (_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ପୃଥକ"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/Filespecକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ବଚ୍ଛିତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସମସ୍ତଙ୍କୁ ବାଛନ୍ତୁ (_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକୁ ମନୋନୀତ କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସମସ୍ତଙ୍କୁ ଅବଛା କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଡ଼ିରେକ୍ଟୋରୀ ତାଲିକାଭୁକ୍ତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/SITE ଆଦେଶ ପଠାନ୍ତୁ..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଡ଼ିରେକ୍ଟୋରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଅନୁମତି (_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ନୂତନ ଫୋଲଡ଼ର (_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ପୁନଃ ନାମକରଣ କରନ୍ତୁ (_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଅପସାରଣ କରନ୍ତୁ (_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସମ୍ପାଦନ କରନ୍ତୁ (_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ଦେଖନ୍ତୁ (_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/ଦୂରବର୍ତ୍ତୀ/ସତେଜନ କରନ୍ତୁ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ (_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ (_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/ଚିହ୍ନିତ ସ୍ଥାନଗୁଡ଼ିକ/ପୃଥକ"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ (_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଆରମ୍ଭ (_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଅଟକାନ୍ତୁ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ପୃଥକ"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ସାମ୍ପ୍ରତିକ ଫାଇଲଗୁଡ଼ିକୁ ଏଡ଼ାଇଯାଆନ୍ତୁ (_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଫାଇଲଗୁଡ଼ିକୁ କାଢ଼ନ୍ତୁ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଫାଇଲଗୁଡ଼ିକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ (_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଫାଇଲଗୁଡ଼ିକୁ ତଳକୁ ଘୁଞ୍ଚାନ୍ତୁ (_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଫାଇଲଗୁଡ଼ିକୁ କାଢନ୍ତୁ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/ସ୍ଥାନାନ୍ତରଣ/ଫାଇଲଗୁଡ଼ିକୁ ରଖନ୍ତୁ (_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/ଲଗ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/ଲଗ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/ଲଗ/ସଫା କରନ୍ତୁ (_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/ଲଗ/ଦୃଶ୍ୟ (_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/ଲଗ/ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ସାଧନଗୁଡ଼ିକ (_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ସାଧନଗୁଡ଼ିକ/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/ସାଧନଗୁଡ଼ିକ/ୱିଣ୍ଡୋଗୁଡ଼ିକୁ ତୁଳନା କରନ୍ତୁ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/ସାଧନଗୁଡ଼ିକ/କ୍ୟାଶେ ସଫାକରନ୍ତୁ (_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/ସହାୟତା"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/ସହାୟତା/ଛିଣ୍ଡାନ୍ତୁ"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/ସହାୟତା/ବିବରଣୀ (_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "ଆଧାର:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "ଆଧାର (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "ସଂଯୋଗିକୀ:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ଚାଳକ: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ଚାଳକ (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "ପାସ: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "ଆଦେଶ: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ଫାଇଲ ନାମ"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "ଆକାର"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "ତାରିଖ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "ଗୁଣଗୁଡିକ"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ପ୍ରଗତି"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ତୃଟି: ତୁମେ ସଂୟୋଗ କରିବାକୁ ନିଶ୍ଚଯ ଏକ ହୋଷ୍ଟରେ ଟାଇପ କରିବ\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ସତେଜନ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ଚାଳକ ନାମ ଭରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "ଏହି ସାଇଟ ପାଇଁ ଆପଣଙ୍କର ଚାଳକ ନାମ ଭରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "ଦୟାକରି ଏହି ସାଇଟ ପାଇଁ ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "ପ୍ରୟୋଗକୁ ବାତିଲ କରାଯାଇଛି...ଆପଣଙ୍କୁ ଗୋଟିଏ ବାକ୍ୟଖଣ୍ଡ ଭରଣ କରିବା ଉଚିତ\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀ ତିଆରି କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "ସୃଷ୍ଟି କରିବାକୁ ଥିବା ଡ଼ିରେକ୍ଟୋରୀର ନାମ ଭରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "ପୁନଃନାମକରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s କୁ ଆପଣ କଣ ପୁନଃନାମକରଣ କରିବାକୁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "ସାଇଟ"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ସାଇଟ-ବିଶେଷ ଆଦେଶ ପ୍ରବେଶ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE ସହିତ ପୂର୍ବରୁ ଝୁଲିଛି"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "ନବଲିଖନ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "ପୁନଃ ଚଳନ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "ଛାଡି ଦିଅନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "କାର୍ଯ୍ୟ"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ଫାଇଲଗୁଡିକୁ ସ୍ଥାନାନ୍ତରଣ କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2595,61 +2576,61 @@ msgstr ""
 "ନିମ୍ନ ଫାଇଲ(ଗୁଡିକ) ଉଭୟ ସ୍ଥାନୀୟ ଏବଂ ଦୂରବର୍ତ୍ତୀ କମ୍ପୁଟରରେ ଅଛି\n"
 "ଦୟାକରି ଆପଣ ଯାହା ଚାହୁଁଛନ୍ତି କରନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ତ୍ରୁଟି"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ଫାଇଲକୁ ଏଡ଼ାଇ ଦିଅନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "ସମସ୍ତଙ୍କୁ ବାଛନ୍ତୁ"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "ସମସ୍ତଙ୍କୁ ଅବଛା କରନ୍ତୁ"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Filespecକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ: କାର୍ଯ୍ୟ ରଦ୍ଦ ହେଲା...ଆପଣ ନିଶ୍ଚିତ ରୂପେ ଏକ ବାକ୍ଯଖଣ୍ଡ ପ୍ରବେଶ କରିବା "
 "ଉଚିତ\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespecକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ତୃଟି: ଲେଖିବା ପାଇଁ %s କୁ ଖୋଲି ପାରିବେ ନାହିଁ: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀ ତାଲିକାଭୁକ୍ତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ତୃଟି: %s ରେ ଲେଖିବା ସମୟରେ ତୃଟି: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%sରେ ଲଗ ଫାଇଲକୁ ସଫଳତା ସହିତ ଲେଖାଗଲା\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "ଲଗକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2658,11 +2639,11 @@ msgstr ""
 "ଅନୁମତିପତ୍ର ରାଜିନାମା ଫାଇଲ COPYING ପାଇପାରୁ ନାହିଁ। ଦୟାକରି ନିଶ୍ଚିତ କର ୟେ ଏହା ହୁଏତ %s ରେ କିମ୍ବା "
 "%s ରେ ଅଛି"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP ବିଷୟରେ"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2673,100 +2654,80 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "ବିବରଣୀ"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ଅନୁମତିପତ୍ର ରାଜିନାମା"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  ବନ୍ଦ କରନ୍ତୁ  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "ୱିଣ୍ଡୋଗୁଡିକୁ ତୁଳନା କରନ୍ତୁ"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "ଦୂରବର୍ତ୍ତୀ ସର୍ଭରରୁ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
-"ଆଧାର ଭରଣରେ ଉଲ୍ଲିଖିତ ସାଇଟ ସହିତ ସଂଯୋଗ କରନ୍ତୁ। ଯଦି ଆଧାର ଭରଣଟି ଖାଲି ଅଛି, ତେବେ "
-"ସଂଳାପକୁ ଉପସ୍ଥାପନ କରିଥାଏ ଯାହାକି ଆପଣଙ୍କୁ ଗୋଟିଏ URL ରେ ପ୍ରବେଶ ପାଇଁ ଅନୁମତି ଦେଇଥାଏ। "
+"ଆଧାର ଭରଣରେ ଉଲ୍ଲିଖିତ ସାଇଟ ସହିତ ସଂଯୋଗ କରନ୍ତୁ। ଯଦି ଆଧାର ଭରଣଟି ଖାଲି ଅଛି, ତେବେ ସଂଳାପକୁ "
+"ଉପସ୍ଥାପନ କରିଥାଏ ଯାହାକି ଆପଣଙ୍କୁ ଗୋଟିଏ URL ରେ ପ୍ରବେଶ ପାଇଁ ଅନୁମତି ଦେଇଥାଏ। "
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକ"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (କ୍ୟାଶେ ହୋଇଛି) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "ସଂଯୁକ୍ତ ହୋଇନାହିଁ"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ଫାଇଲ %s କୁ ଖୋଲିବାରେ ତୃଟି: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ଏକ ଦୂରବର୍ତ୍ତୀ ସାଇଟ ସହିତ ସଂଯୋଗ ହୋଇନାହିଁ\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ଏହି ପ୍ରୋଟୋକଲ ବ୍ଯବହାର କରି ଏହି ବିଶେଷତା ଉପଲବ୍ଧ ହେଉ ନାହିଁ\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: ଆପଣ ନିଶ୍ଚିତରୂପେ କେବଳ ଏକ ବସ୍ତୁକୁ ମନୋନୀତ କରିବା ଉଚିତ\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: ଆପଣ ନିଶ୍ଚିତରୂପେ ଅତି କମରେ ଗୋଟିଏ ବସ୍ତୁକୁ ମନୋନୀତ କରିବା ଉଚିତ\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "ଯୋଗ କରନ୍ତୁ"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ବାତିଲ କରନ୍ତୁ"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  ହଁ  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  ନାହିଁ  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ଡ଼ିରେକ୍ଟୋରୀ ତାଲିକାଗୁଡିକ ପାଉଛି"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  ବନ୍ଦ କରନ୍ତୁ  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2775,109 +2736,89 @@ msgstr ""
 "%ld ଡ଼ିରେକ୍ଟୋରୀ ଏବଂ\n"
 "%ld ଫାଇଲଗୁଡିକ ପ୍ରାପ୍ତ ହେଲା"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP ତୃଟି : %s ରେ କିମ୍ବା %s ରେ ଫାଇଲ %s ପାଇ ପାରୁ ନାହିଁ\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ଆଧାର ସଂପାଦନା କରନ୍ତୁ"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "ଆଧାର ଯୋଗ କରନ୍ତୁ"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "ପ୍ରକାର:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "ପ୍ରକାର (_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ପରିସର"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "ନେଟୱର୍କ ଠିକଣା"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "ନେଟୱର୍କ ଠିକଣା (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "ନେଟମାସ୍କ"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "ନେଟମାସ୍କ (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ପରିସର (_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "ନେଟମାସ୍କ"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "ସ୍ଥାନୀୟ ଆଧାରଗୁଡିକ"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ବିକଳ୍ପଗୁଡିକ"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ଫାଇଲ ନାମଗୁଡିକ ପ୍ରାପ୍ତ ହେଉଛି..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "ସଂଯୋଗ କରୁଅଛି..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ଫାଇଲଗୁଡିକୁ ପୁନରୁଦ୍ଧାର କରନ୍ତୁ: ଏକ ଦୂରବର୍ତ୍ତୀ ସାଇଟ ସହିତ ସଂଯୁକ୍ତ ହୋଇନାହିଁ\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ତୃଟି:%d ନିମ୍ନସ୍ତର %d ଫେରାଇଲା\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "ନିମ୍ନସ୍ତର %d ସଫଳତା ପୂର୍ବକ ଫେରି ଆସିଲା\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "ତ୍ରୁଟି: ଉପଶାଖା %d ସଠିକ ଭାବରେ ସମାପ୍ତ ହେଲା ନାହିଁ\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ତୃଟି:ଫାଇଲ୍  %s ବିଷୟରେ କୌଣସି ସୂଚନା ପାଇ ପାରୁ ନାହିଁ: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ଫାଇଲ %s କୁ ପରିବର୍ତ୍ତନ କରାଗଲା ନାହିଁ\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2886,115 +2827,153 @@ msgstr ""
 "ଫାଇଲ୍%s  ପରିବର୍ତ୍ତିତ ହୋଇଛି।\n"
 "ଆପଣ ଏହାକୁ ଧାରଣ କରିବାକୁ ଚାହାଁନ୍ତି କି?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ଫାଇଲ ସଂପାଦନ କରନ୍ତୁ"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ସମାପ୍ତହେଲା"
 
-#: ../src/gtk/transfer.c:734
+#: 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 est. ସମୟ ବଳିଛି"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. ସମୟ ବଳିଅଛି"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "ପଠାହୋଇଥିବା %s ର %s, ପରିବହନ ସ୍ଥଗିତ ଅଛି, ବଳକା ସମୟ ଜଣା ନାହିଁ"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s, ପରିବହନ ଅଟକିଯାଇଛି, ଅଜଣା ସମୟ ବଳିଅଛି"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "ଅଜଣା ପ୍ରତିଶତ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି। (ଫାଇଲ %ld ର %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 est. ସମୟ ବାକିଅଛି। ( %ld ର ଫାଇଲ୍ %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ଫାଇଲନାମଗୁଡିକୁ ପୁନରୁଦ୍ଧାର ହେଉଛି ...%s ବାଇଟ୍ସ"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "ଦୃଶ୍ଯ"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "ସମ୍ପାଦନ କରନ୍ତୁ"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "ଦେଖନ୍ତୁ: ଅନ୍ଯ ଏକ ପ୍ରକ୍ରିୟାକୁ ଦ୍ବିଭାଗ କରିପାରୁ ନାହିଁ: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "ପ୍ରୋଗ୍ରାମ ଚାଲୁଅଛି: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ସହିତ %s କୁ ଖୋଲୁଅଛି\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ଫାଇଲ %s କୁ ଦେଖୁଅଛି\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "ଦେଖନ୍ତୁ: ଫାଇଲ %s କୁ ଖୋଲିପାରୁ ନାହିଁ: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "ନିୟନ୍ତ୍ରଣ କରୁଥିବା ସମାପ୍ତି %sକୁ ଖୋଲି ପାରୁ ନାହିଁ\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ଚାଳକନାମ [ଅଜ୍ଞାତ]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି। (%s ଉତ୍ସ ଆକାର, %s ଲକ୍ଷ୍ଯସ୍ଥଳ ଆକାର):\n"
 "(o)ନବଲିଖନ, (r)ପୁନଃଚଳନ, (s)ଏଡ଼ାଇ ଯିବା, ସମସ୍ତଙ୍କୁ (O)ନବଲିଖନ କରନ୍ତୁ, ସମସ୍ତଙ୍କୁ (R)ପୁନଃଚଳନ "
 "କରନ୍ତୁ, ସମସ୍ତଙ୍କୁ (S)ଏଡ଼ାଇ ଯାଆନ୍ତୁ: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  ରଦ୍ଦକରନ୍ତୁ  "
+
+#~ msgid "Host: "
+#~ msgstr "ଆଧାର:"
+
+#~ msgid "User: "
+#~ msgstr "ଚାଳକ: "
+
+#~ msgid "  Close  "
+#~ msgstr "  ବନ୍ଦ କରନ୍ତୁ  "
+
+#~ msgid "Add"
+#~ msgstr "ଯୋଗ କରନ୍ତୁ"
+
+#~ msgid "Cancel"
+#~ msgstr "ବାତିଲ କରନ୍ତୁ"
+
+#~ msgid "  Yes  "
+#~ msgstr "  ହଁ  "
+
+#~ msgid "  No  "
+#~ msgstr "  ନାହିଁ  "
+
+#~ msgid "Type:"
+#~ msgstr "ପ୍ରକାର:"
+
+#~ msgid "Network Address"
+#~ msgstr "ନେଟୱର୍କ ଠିକଣା"
+
+#~ msgid "_Edit"
+#~ msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
+
+#~ msgid "Apply"
+#~ msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ"
diff --git a/po/pa.po b/po/pa.po
index 0cbad79..7cad12e 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,97 +11,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.pa\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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-06-13 08:11+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "ਗਲਤ URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ਗਲਤੀ: ਕੈਂਚੇ ਇੰਡੈਕਸ ਫਾਇਲ ਵਿੱਚ %s ਗਲਤ ਸਤਰ\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+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
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ਗਲਤੀ: ਲੋਕਲ ਫਾਇਲ %s ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ਗਲਤੀ: ਸਾਕਟ ਉੱਤੇ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ਗਲਤੀ: ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "ਚੇਤਾਵਨੀ: ਮਾਸਟਰ ਬੁੱਕਮਾਰਕ ਫਾਇਲ %s ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕਦੀ ਹੈ।\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP ਚੇਤਾਵਨੀ: ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਵਿੱਚ %d ਲਾਈਨ ਛੱਡੀ ਜਾ ਰਹੀ ਹੈ: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ਚੇਤਾਵਨੀ: ਲਾਈਨ %d ਵਿੱਚ ਲੋੜੀਦੇ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਹਨ\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -111,58 +112,58 @@ msgstr ""
 "ਨਹੀਂ ਹੈ (ਜੇ ਉਪਲੱਬਧ ਹੋਵੇ ਤਾਂ)। ਸਨਟੈਕਸ: dont_use_proxy=.domain ਜਾਂ "
 "dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲ ਕਰਨਾ ਹੈ?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP ਗਲਤੀ: ਲਾਗ ਫਾਇਲ ਨਾਂ %s ਗਲਤ ਹੈ \n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -170,7 +171,7 @@ msgstr ""
 "gFTP ਲਈ ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਹੈ। ਕਾਪੀਰਾਈਟ C) 1998-2007 Brian Masney <masneyb gftp "
 "org>। ਚੇਤਾਵਨੀ: ਇਸ ਫਾਇਲ ਵਿੱਚ ਜੇ ਤੁਸੀਂ ਕੋਈ ਟਿੱਪਣੀ ਸ਼ਾਮਲ ਕੀਤੀ ਤਾਂ ਫਾਇਲ *ਉੱਤੇ* ਲਿਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -178,7 +179,7 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -188,102 +189,101 @@ msgstr ""
 "ਚੇਤਾਵਨੀ: ਇਸ ਫਾਇਲ ਵਿੱਚ ਜੇ ਤੁਸੀਂ ਕੋਈ ਟਿੱਪਣੀ ਸ਼ਾਮਲ ਕੀਤੀ ਤਾਂ ਫਾਇਲ *ਉੱਤੇ* ਲਿਖਿਆ ਜਾਵੇਗਾ। ਜੇ "
 "ਐਂਟਰੀ ਲਈ ਇਸ ਦੀ ਟਿੱਪਣੀ ਵਿੱਚ (*) ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਇਸ ਨੂੰ gFTP ਵਿੱਚ ਬਦਲ ਨਹੀਂ ਸਕਦੇ ਹੋ।"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ਅਣਜਾਣ>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "ਗਲਤੀ: ਆਰਜ਼ੀ ਫਾਇਲ %s ਅੱਪਲੋਡ ਨਹੀਂ ਹੋ ਸਕਦੀ\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "ਗਲਤੀ: ਆਰਜ਼ੀ ਫਾਇਲ %s ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "ਗਲਤੀ: ਫਾਇਲ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP ਸਰਵਰ %s ਤੋਂ ਨਿਕਾਰਾ ਫਾਇਲ ਲਿਸਟ!\n"
 
-#: ../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
+#: 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 "ਅਣਜਾਣ"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "%s ਤੋਂ FSP ਡਾਇਰੈਕਟਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਤੋਂ %s ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤੀ ਗਈ\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਤੋਂ %s ਤਬਦੀਲ ਨਹੀਂ ਹੋ ਸਕੀ\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s ਸਫਲਤਾਪੂਰਕ ਹਟਾਇਆ ਗਿਆ\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ਗਲਤੀ: ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
-"FTPS ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਕਿਉਂਕਿ SSL ਸਹਿਯੋਗ ਕੰਪਾਇਲ ਨਹੀਂ "
-"ਕੀਤਾ। ਕੁਨੈਕਸ਼ਨ ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ।\n"
+"FTPS ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਕਿਉਂਕਿ SSL ਸਹਿਯੋਗ ਕੰਪਾਇਲ ਨਹੀਂ ਕੀਤਾ। ਕੁਨੈਕਸ਼ਨ ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ "
+"ਰਿਹਾ ਹੈ।\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -291,107 +291,105 @@ msgstr ""
 "HTTPS ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਕਿਉਂਕਿ SSL ਸਹਿਯੋਗ ਇਸ ਵਿੱਚ ਕੰਪਾਇਲ ਨਹੀਂ ਹੈ। ਕੁਨੈਕਸ਼ਨ ਛੱਡਿਆ ਜਾ "
 "ਰਿਹਾ ਹੈ।\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "ਮੌਜੂਦਾ ਵਰਕਿੰਗ ਡਾਇਰੈਕਟਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ ਨੂੰ %s ਲਈ ਬਦਲਿਆ ਗਿਆ\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ %s ਲਈ ਨਹੀਂ ਬਦਲੀ ਜਾ ਸਕੀ: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "ਗਲਤੀ: ਲੋਕਲ ਫਾਇਲ %s ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ ਲਿਸਟਿੰਗ %s ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ਦਾ ਢੰਗ %o ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ ਹੈ\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s ਦੀ ਸਮਾਂ ਮੋਹਰ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲੀ ਗਈ\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "ਗਲਤੀ: %s ਲਈ ਸਮਾਂ-ਮੋਹਰ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ਲੋਕਲ ਫਾਇਲ ਸਿਸਟਮ"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ਵਰਤੋਂ: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ਫਾਇਲ"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "ਸਾਈਜ਼"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "ਯੂਜ਼ਰ"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "ਗਰੁੱਪ"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "ਸਮਾਂ-ਮਿਤੀ"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "ਘੱਟਦੇ ਕਰਮ ਵਿੱਚ"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ਵੱਧਦੇ ਕਰਮ ਵਿੱਚ"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "ਪਰੋਗਰਾਮ ਵੇਖੋ:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -399,27 +397,27 @@ msgstr ""
 "ਫਾਇਲ ਵੇਖਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਡਿਫਾਲਟ ਪਰੋਗਰਾਮ ਹੈ। ਜੇ ਇਹ ਖਾਲੀ ਹੋਇਆ ਤਾਂ ਅੰਦਰੂਨੀ ਫਾਇਲ ਦਰਸ਼ਕ "
 "ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "ਪਰੋਗਰਾਮ ਸੋਧ:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "ਫਾਇਲਾਂ ਸੋਧਣ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਪਰੋਗਰਾਮ ਹੈ।"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "ਵੱਧੋ-ਵੱਧ ਲਾਗ ਵਿੰਡੋ ਸਾਈਜ਼: "
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ ਪੋਰਟ ਲਈ ਲਾਗ ਵਿੰਡੋ ਦਾ ਵੱਧੋ-ਵੱਧ ਸਾਈਜ਼ ਬਾਈਟ ਵਿੱਚ।"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "ਰਿਮੋਟ ਅੱਖਰ ਸੈੱਟ:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -427,190 +425,197 @@ msgstr ""
 "ਇਹ ਅੱਖਰ-ਸੈੱਟ ਦੀ ਇੱਕ ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਮੌਜੂਦਾ ਲੋਕੇਲ ਤੋਂ ਰਿਮੋਟ ਸੁਨੇਹੇ ਬਦਲਣ ਦੀ "
 "ਕੋਸ਼ਿਸ਼ ਹੈ"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "ਰਿਮੋਟ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ਦਾ ਮੁੱਲ ਹੈ। ਇਹ ਤਾਂ ਹੈ ਕਿ ਤਾਂ ਕਿ ਡਾਇਰੈਕਟਰੀ ਵੇਖਾਉਣ ਦੌਰਾਨ ਮਿਤੀ ਨੂੰ ਪਾਰਸ "
-"ਕੀਤਾ ਜਾ ਸਕੇ।"
+"ਰਿਮੋਟ ਸਾਈਟ ਲਈ ਇਹ LC_TIME ਦਾ ਮੁੱਲ ਹੈ। ਇਹ ਤਾਂ ਹੈ ਕਿ ਤਾਂ ਕਿ ਡਾਇਰੈਕਟਰੀ ਵੇਖਾਉਣ ਦੌਰਾਨ ਮਿਤੀ ਨੂੰ "
+"ਪਾਰਸ ਕੀਤਾ ਜਾ ਸਕੇ।"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "ਕੈਸ਼ TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "ਮਿਆਦ ਖਤਮ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਕੈਸ਼ ਐਂਟਰੀਆਂ ਨੂੰ ਰੱਖਣ ਵਾਸਤੇ ਸਕਿੰਟਾਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਜੋੜੋ"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ਨਵਾਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਨੂੰ ਮੌਜੂਦਾ ਵਿੱਚ ਜੋੜ ਦਿਓ"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ਇੱਕ ਸਮੇਂ ਇੱਕ ਹੀ ਤਬਦੀਲ ਕਰੋ"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ਕੀ ਇੱਕ ਸਮੇਂ ਇੱਕ ਹੀ ਤਬਦੀਲ ਕਰਨੀ ਹੈ?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "ਡਿਫਾਲਟ ਹੀ ਉੱਤੇ ਲਿਖੋ"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "ਡਿਫਾਲਟ ਹੀ ਫਾਇਲਾਂ ਉੱਤੇ ਲਿਖੋ ਜਾਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਰੀਜਿਊਮ ਕਰਨਾ ਸੈੱਟ ਕਰੋ"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "ਫਾਇਲ ਅਧਿਕਾਰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "ਟਰਾਂਸਫਰ ਕੀਤੀਆਂ ਫਾਇਲਾਂ ਦੇ ਅਧਿਕਾਰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "ਫਾਇਲ ਟਾਈਮ ਰੱਖੋ"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "ਟਰਾਂਸਫਰ ਕੀਤੀਆਂ ਫਾਇਲਾਂ ਦਾ ਫਾਇਲ ਸਮਾਂ ਸੁਰੱਖਿਅਤ ਰੱਖੋ"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ਹਰੇਕ ਫਾਇਲ ਟਰਾਂਸਫਰ ਬਾਅਦ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ਹਰੇਕ ਫਾਇਲ ਟਰਾਂਸਫਰ ਕਰਨ ਬਾਅਦ ਲਿਸਟ-ਬਾਕਸ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਪਹਿਲਾਂ ਕ੍ਰਮਬੱਧ"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "ਪਹਿਲਾਂ ਡਾਇਰੈਕਟਰੀਆਂ ਰੱਖੋ ਅਤੇ ਫੇਰ ਫਾਇਲਾਂ"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "ਲੁਕਵੀਆਂ ਫਾਇਲਾਂ ਵੇਖੋ"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "ਲਿਸਟ-ਬਕਸੇ ਵਿੱਚ ਲੁਕਵੀਆਂ ਫਾਇਲਾਂ ਵੇਖੋ"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "ਟਾਈਟਲ ਵਿੱਚ ਟਰਾਂਸਫਰ ਸਟੇਟਸ ਵੇਖੋ"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "ਟਾਈਟਲ-ਪੱਟੀ ਵਿੱਚ ਫਾਇਲ ਟਰਾਂਸਫਰ ਹਾਲਤ ਵੇਖੋ"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸ਼ੁਰੂ"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "ਜਦੋਂ ਕਤਾਰ ਮਿਲੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI ਵਿੱਚ ਦਸਤੀ ਕਮਾਂਡ ਮਨਜ਼ੂਰ"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUI ਵਿੱਚ ਦਸਤੀ ਕਮਾਂਡ ਦੇਣਾ ਮਨਜ਼ੂਰ (ਟੈਕਸਟ ਪੋਰਟ ਵਾਂਗ ਕੰਮ)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ ਯਾਦ ਰੱਖੋ"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਹੋਵੇ ਤਾਂ ਆਖਰੀ ਲੋਕਲ ਅਤੇ ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਰਿਮੋਟ ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਟ ਕਰੋ"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਰਿਮੋਟ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ।"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "ਨੈੱਟਵਰਕ ਟਾਈਮ-ਆਉਟ:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "ਨੈੱਟਵਰਕ ਇੰਪੁੱਟ/ਆਉਟਪੁਟ ਲਈ ਟਾਈਮ-ਆਉਟ ਵੇਟਿੰਗ ਹੈ। ਇਹ ਵੇਹਲਾ ਟਾਈਮ-ਆਉਟ ਨਹੀਂ ਹੈ।"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "ਕੁਨੈਕਟ ਮੁੜ-ਟਰਾਈ:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "ਆਟੋਮੈਟਿਕ ਮੁੜ-ਟਰਾਈ ਕਰਨ ਦੀ ਗਿਣਤੀ। ਲਗਾਤਾਰ ਮੁੜ-ਟਰਾਈ ਕਰਨ ਲਈ 0 ਸੈੱਟ ਕਰੋ।"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "ਰੀ-ਟਰਾਈ ਸਲੀਪ ਟਾਈਮ:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "ਰੀ-ਟਰਾਈਆਂ ਦੇ ਵਿੱਚ ਉਡੀਕ ਲਈ ਸਕਿੰਟਾਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "ਵੱਧੋ-ਵੱਧ KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "ਵੱਧੋ-ਵੱਧ KB/s, ਜੋ ਇੱਕ ਫਾਇਲ ਟਰਾਂਸਫਰ ਲੈ ਸਕਦੀ ਹੈ (ਆਯੋਗ ਕਰਨ ਵਾਸਤੇ 0 ਸੈੱਟ ਕਰੋ)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "ਟਰਾਂਸਫਰ ਬਲਾਕ ਅਕਾਰ:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "ਫਾਇਲਾਂ ਟਰਾਂਸਫਰ ਕਰਨ ਲਈ ਬਲਾਕ ਦਾ ਸਾਈਜ਼ ਹੈ। ਇਹ 1024 ਦਾ ਗੁਣਾਂਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ਡਿਫਾਲਟ ਪਰੋਟੋਕਾਲ:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "ਇਹ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਪਰੋਟੋਕਾਲ ਦਿੰਦਾ ਹੈ"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 ਸਹਿਯੋਗ ਯੋਗ"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -618,41 +623,42 @@ msgstr ""
 "ਇਹ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਜੇ ਤੁਸੀਂ ਫਾਇਲ ਲਿਸਟ-ਬਾਕਸ ਵਿੱਚ ਇੱਕ ਫਾਇਲ ਉੱਤੇ ਡਬਲ ਕਲਿੱਕ ਕਰੋ ਤਾਂ ਕੀ ਹੋਵੇਗਾ। "
 "0=ਫਾਇਲ ਵੇਖੋ, 1=ਫਾਇਲ ਸੋਧ 2=ਫਾਇਲ ਟਰਾਂਸਫਰ"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ਲੋਕਲ ਫਾਇਲ ਲਿਸਟ-ਬਾਕਸ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "ਰਿਮੋਟ ਫਾਇਲ ਲਿਸਟ-ਬਾਕਸ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ਲੋਕਲ/ਰਿਮੋਟ ਫਾਇਲ ਲਿਸਟ-ਬਾਕਸ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "ਤਬਦੀਲ ਸੂਚੀਬਕਸੇ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "ਲਾਗਇਨ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ"
 
-#: ../lib/options.h:177
+#: 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
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ਡਿਫਾਲਟ ਕਾਲਮ, ਜਿਸ ਰਾਹੀਂ ਕ੍ਰਮਬੱਧ ਕਰਨਾ ਹੈ"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ਵੱਧਦਾ ਕ੍ਰਮ ਜਾਂ ਘੱਟਦਾ"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -660,7 +666,7 @@ msgstr ""
 "ਫਾਇਲ ਲਿਸਟਬਾਕਸ ਵਿੱਚ ਫਾਇਲ ਨਾਂ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਡਿਫਾਲਟ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ "
 "ਹੋ ਕਿ ਇਹ ਆਟੋਮੈਟਿਕ ਢੰਗ ਨਾਲ ਰੀ-ਸਾਇਜ਼ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -668,7 +674,7 @@ msgstr ""
 "ਫਾਇਲ਼ ਸੂਚੀਬਕਸੇ ਵਿੱਚ ਅਕਾਰ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਮੂਲ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਇਹ "
 "ਸਵੈ-ਚਾਲਤ ਢੰਗ ਨਾਲ ਨਿਰਧਾਰਤ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -676,7 +682,7 @@ msgstr ""
 "ਫਾਇਲ਼ ਸੂਚੀਬਕਸੇ ਵਿੱਚ ਉਪਭੋਗਤਾ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਮੂਲ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਇਹ "
 "ਸਵੈ-ਚਾਲਤ ਢੰਗ ਨਾਲ ਨਿਰਧਾਰਤ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -684,7 +690,7 @@ msgstr ""
 "ਫਾਇਲ਼ ਸੂਚੀਬਕਸੇ ਵਿੱਚ ਸਮੂਹ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਮੂਲ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਇਹ ਸਵੈ-"
 "ਚਾਲਤ ਢੰਗ ਨਾਲ ਨਿਰਧਾਰਤ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -692,7 +698,7 @@ msgstr ""
 "ਫਾਇਲ਼ ਸੂਚੀਬਕਸੇ ਵਿੱਚ ਡਾਟਾ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਮੂਲ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਇਹ "
 "ਸਵੈ-ਚਾਲਤ ਢੰਗ ਨਾਲ ਨਿਰਧਾਰਤ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -700,183 +706,183 @@ msgstr ""
 "ਫਾਇਲ਼ ਸੂਚੀਬਕਸੇ ਵਿੱਚ ਗੁਣ ਕਾਲਮ ਦੀ ਚੌੜਾਈ ਹੈ। ਇਸ ਦਾ ਮੂਲ 0 ਹੋਵੇਗਾ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਇਹ ਸਵੈ-"
 "ਚਾਲਤ ਢੰਗ ਨਾਲ ਨਿਰਧਾਰਤ ਹੋਵੇ। ਇਸ ਕਾਲਮ ਨੂੰ ਆਯੋਗ ਕਰਨ ਲ਼ਈ -1 ਦਿਓ।"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "ਸਰਵਰ ਤੇ ਭੇਜਣ ਵਾਲੀਆਂ ਕਮਾਂਡਾਂ ਦਾ ਰੰਗ"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "ਸਰਵਰ ਤੋਂ ਪ੍ਰਾਪਤ ਹੋਣ ਵਾਲੀਆਂ ਕਮਾਂਡਾਂ ਦਾ ਰੰਗ"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "ਗਲਤੀ ਸੁਨੇਹਿਆਂ ਦਾ ਰੰਗ"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "ਬਾਕੀ ਲਾਗ ਸੁਨੇਹਿਆਂ ਦਾ ਰੰਗ"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "ਲੋਕਲ"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "ਬੁੱਕਮਾਰਕ"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ਫਾਇਲ਼ ਤਬਦੀਲ ਦੀ ਗਤੀ %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME '%s' ਸੈੱਟ ਕਰਨ ਲਈ ਗਲਤੀ। '%s' ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "ਕੈਸ ਤੋਂ ਡਾਇਰੈਕਟਰੀ ਲਿਸਟ %s ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "ਸਰਵਰ ਤੋਂ ਡਾਇਰੈਕਟਰੀ ਲਿਸਟ %s ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, 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:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ਗਲਤੀ: ਕੈਸ਼ ਲਈ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ਗਲਤੀ: ਬੁੱਕਮਾਰਕ %s ਨੂੰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "ਬੁੱਕਮਾਰਕ ਗਲਤੀ: ਬੁੱਕਮਾਰਕ ਐਂਟਰੀ %s ਲਈ ਹੋਸਟ ਨਾਂ ਨਹੀਂ\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "ਪਰੋਟੋਕਾਲ '%s' ਇਸ ਮੌਕੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "ਗਲਤੀ: ਰਿਮੋਟ ਸਾਇਟ %s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟਿਆ ਹੈ। ਅਧਿਕਤਮ ਕੋਸ਼ਿਸ਼ਾਂ ਹੋਈ...ਛੱਡਿਆ ਜਾਦਾ ਹੈ\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "ਮਾਸਟਰ pty %s ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ਸਾਕਟ ਜੋੜਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ਗਲਤੀ: ssh ਚਲਾਈ ਨਹੀ ਜਾ ਸਕੀ : %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "ਹੋਰ ਕਾਰਜ ਬਣਾਇਆ ਨਹੀ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ਪਰਾਕਸੀ ਹੋਸਟ-ਨਾਂ:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ਫਾਇਰਵਾਲ ਹੋਸਟ ਨਾਂ"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "ਪਰਾਕਸੀ ਪੋਰਟ:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ਫਾਇਲਵਾਲ ਤੇ ਜੁੜਨ ਲਈ ਪੋਰਟ"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "ਪਰਾਕਸੀ ਯੂਜ਼ਰ-ਨਾਂ:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "ਤੁਹਾਡਾ ਫਾਇਰਵਾਲ ਯੂਜ਼ਰ-ਨਾਂ"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ਪਰਾਕਸੀ ਪਾਸਵਰਡ:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "ਤੁਹਾਡਾ ਫਾਇਰਵਾਲ ਪਾਸਵਰਡ"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 ਵਰਤੋਂ"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -885,83 +891,84 @@ msgstr ""
 "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ ਮਿਲਿਆ ਹੈ, ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ\n"
 "ਰਿਮੋਟ ਸਰਵਰ ਨੇ ਗਲਤ ਚੱਕ ਸਾਈਜ਼ '%s' ਵਾਪਸ ਭੇਜਿਆ ਹੈ\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ਆਫਸੈਟ ਤੇ ਫਾਇਲ ਤਬਦੀਲੀ ਸ਼ੁਰੂ ਹੋਈ"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੂਚੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ ਮਿਲਿਆ ਹੈ, ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE ਕਮਾਂਡ"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP ਪਰਾਕਸੀ"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "ਸੋਧ"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 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
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "ਪਰਾਕਸੀ ਅਕਾਊਂਟ:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "ਤੁਹਾਡਾ ਫਾਇਰਵਾਲ ਅਕਾਊਂਟ (ਚੋਣਵਾਂ)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "ਪਰਾਕਸੀ ਸਰਵਰ ਕਿਸਮ:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -977,11 +984,11 @@ msgstr ""
 "(ਪਾਸਵਰਡ), h (ਹੋਸਟ), o (ਪੋਰਟ), ਜਾਂ a (ਅਕਾਊਂਟ) ਲਈ ਹੋ ਸਕਦਾ ਹੈ। ਉਦਾਹਰਨ ਵਾਸਤੇ ਪਰਾਕਸੀ ਯੂਜ਼ਰ "
 "ਲਈ ਤੁਸੀਂ %pu ਲਿਖ ਸਕਦੇ ਹੋ।"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV ਐਡਰੈੱਸ ਅਣਡਿੱਠਾ"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -989,11 +996,11 @@ msgid ""
 "address in a PASV reply."
 msgstr ""
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "ਪੈਸਿਵ ਫਾਇਲ ਟਰਾਂਸਫਰ"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1007,11 +1014,11 @@ msgstr ""
 "ਕਿ ਤੁਸੀਂ ਇੱਕ ਪੁਰਾਣੇ FTP ਸਰਵਰ ਨਾਲ ਨਹੀਂ ਜੁੜ ਰਹੇ, ਜੋ ਕਿ ਇਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਜੇ ਇਹ ਆਯੋਗ ਕੀਤਾ "
 "ਤਾਂ gFTP ਕਲਾਇਟ ਸਾਈਡ ਉੱਤੇ ਇੱਕ ਪੋਰਟ ਖੋਲ੍ਹੇਗਾ ਅਤੇ ਰਿਮੋਟ ਸਰਵਰ ਇਸ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ।"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "ਹੱਲ ਰਿਮੋਟ Symlink (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1022,15 +1029,16 @@ msgstr ""
 "ਛੱਡਣਾ ਠੀਕ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਕੇਵਲ ਉਸੇ ਸਮੇਂ ਆਯੋਗ ਕਰਨਾ ਚਾਹੋਗੇ, ਜਦੋਂ ਕਿ ਰਿਮੋਟ FTP -L ਚੋਣ ਨਾਲ LIST "
 "ਲਈ ਸਹਿਯੋਗੀ ਨਾ ਹੋਵੇ।"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ਫਾਇਲਾਂ ASCII ਢੰਗ ਨਾਲ ਤਬਦੀਲ"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1039,330 +1047,323 @@ msgstr ""
 "ਤਬਦੀਲੀ ਕਰ ਰਹੇ ਤਾਂ ਕੋਈ ਸਮੱਸਿਆ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਬਾਈਨਰੀ ਡਾਟਾ ਡਾਊਨਲੋਡ ਕਰ ਰਹੇ ਹੋ ਤਾਂ ਤੁਸੀਂ ਇਸ "
 "ਚੋਣ ਨੂੰ ਆਯੋਗ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: 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:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ਡਾਟਾ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ਪੋਰਟ ਨਾਲ ਬਾਈਡ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "ਇੱਕ IPv6 ਸਾਕਟ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s\n"
 
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "ਗਲਤ EPSV ਜਵਾਬ '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ਲੋਕਲ ਸਾਕਟ ਦਾ ਐਡਰੈੱਸ ਨਹੀਂ ਮਿਲਿਆ: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ਕੁੱਲ"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "ਸਾਕਟ ਨਿਸ਼ਾਨ ਪ੍ਰਾਪਤ ਨਹੀਂ: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "ਸਾਕਟ ਲਈ ਨਾ-ਪਾਬੰਦੀ ਨਹੀਂ ਹੋ ਸਕੀ: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH ਪਰੋਗਰਾਮ ਨਾਂ:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH ਚੱਲ਼ਣਯੋਗ ਲਈ ਮਾਰਗ"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH ਵਾਧੂ ਮੁੱਲ:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH ਪਰੋਗਰਾਮ ਲਈ ਵਾਧੂ ਮੁੱਲ ਦਿਓ"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH ਯੂਜ਼ਰ/ਪਾਸਵਰਡ ਚਾਹੀਦਾ"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH ਕੁਨੈਕਸ਼ਨ ਲਈ ਯੂਜ਼ਰ ਨਾਂ/ਪਾਸਵਰਡ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "ਪਰੋਗਰਾਮ %s ਚੱਲ਼ ਰਿਹਾ ਹੈ\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ ਦਿਓ"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ ਦਿਓ '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ਹਾਂ(yes)/ਨਹੀਂ(no))?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "ਪਾਸਕੋਡ ਦਿਓ:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID ਪਾਸਵਰਡ ਦਿਓ:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ਗਲਤੀ: ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਗਿਆ ਹੈ\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂਆਤ\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: ਪਰੋਟੋਕਾਲ ਵਰਜਨ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s ਖੋਲ੍ਹੋ\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: ਬੰਦ\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: ਡਾਇਰੈਕਟਰੀ %s ਖੋਲ੍ਹੋ\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੋ\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ਫਾਇਲ %s ਹਟਾਓ\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: ਡਾਇਰੈਕਟੀ %s ਬਣਾਓ\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਓ\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: ਅਸਲੀ ਮਾਰਗ %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ਫਾਇਲ ਗੁਣ\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "ਫਾਇਲ ਖਤਮ"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "ਕੋਈ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਨਹੀ ਹੈ"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "ਪਾਬੰਦੀ"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ਅਸਫਲ"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ਗਲਤ ਸੁਨੇਹਾ"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "ਕੋਈ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਟੁੱਟਾ"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "ਕਾਰਵਾਈ ਨਾ-ਸਹਿਯੋਗੀ ਹੈ"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "ਸਰਵਰ ਨੇ ਅਣਜਾਣ ਸੁਨੇਹਾ ਦਿੱਤਾ ਹੈ"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ਗਲਤੀ: ਸੁਨੇਹਾ ਅਕਾਰ %d ਬਹੁਤ ਵੱਡਾ ਹੈ\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1370,41 +1371,41 @@ msgstr ""
 "ਰਿਮੋਟ ਸਰਵਰ ਨਾਲ SSH ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਹੈ। ਰਿਮੋਟ ਸਰਵਰ ਵਲੋਂ ਅੱਗੇ ਦਿੱਤਾ ਗਲਤੀ "
 "ਸੁਨੇਹਾ ਮਿਲਿਆ:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s ਤੇ SSH ਕੁਨੈਕਸ਼ਨ ਸਫਲਤਾਪੂਰਕ ਖੁੱਲਿਆ\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH ਸਰਵਰ %s ਤੇ ਸਫਲਤਾਪੂਰਕ ਲਾਗਇਨ ਕੀਤਾ ਗਿਆ\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL ਇੰਜਣ"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL ਇੰਟ੍ਰੋਪੀ ਫਾਇਲ:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL ਇੰਟ੍ਰੋਪੀ ਫਾਇਲ"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "ਇੰਟ੍ਰੋਪੀ ਸੀਡ ਲੰਬਾਈ:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL ਇੰਜਣ ਨਾਲ ਸੀਡ ਕਰਨ ਲਈ ਅਧਿਕਤਮ ਬਾਈਟਾਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL ਪੀਅਰ ਪੜਤਾਲ"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1417,11 +1418,11 @@ msgstr ""
 "ਵਿਸ਼ਾ = %s\n"
 "ਗਲਤੀ %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "ਪੀਅਰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1430,45 +1431,45 @@ msgstr ""
 "ਗਲਤੀ: SSL ਸਰਟੀਫਿਕੇਟ (%s) ਵਿੱਚ ਹੋਸਟ ਉਸ ਹੋਸਟ ਨਾਲ ਮਿਲਦਾ ਨਹੀਂ ਹੈ, ਜਿਸ ਨਾਲ ਅਸੀਂ ਕੁਨੈਕਟ "
 "ਕੀਤਾ ਹੈ (%s)। ਕੁਨੈਕਸ਼ਨ ਅਧੂਰਾ ਛੱਡਿਆ।\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL ਬਾਈਨਰੀ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "ਡਿਫਾਲਟ SSL ਸਰਟੀਫਿਕੇਟ ਲੋਡ ਕਰਨ ਗਲਤੀ\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "ਸੀਫ਼ਰ ਲਿਸਟ ਸੈਟਿੰਗ ਗਲਤੀ (ਕੋਈ ਠੀਕ ਸੀਫ਼ਰ ਨਹੀਂ)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "ਗਲਤੀ: SSL ਇੰਜਣ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਿਆ\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "ਗਲਤੀ, SSL ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ (BIO ਇਕਾਈ)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "ਗਲਤੀ SSL ਕੁਨੈਕਸਨ ਬਣਾਉਣ ਦੌਰਾਨ (SSL ਇਕਾਈ)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ਪੀਅਰ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਗਲਤੀ: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਲਈ ਮੁੜ ਕੋਸ਼ਸ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ %d ਸਕਿੰਟ ਉਡੀਕ\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1478,76 +1479,76 @@ msgstr ""
 "ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਕੁਝ ਸ਼ਰਤਾਂ ਉੱਤੇ ਇਸ ਨੂੰ ਮੁੜ-ਵੰਡਣ ਦਾ ਅਧਿਕਾਰ ਹੈ। ਵੇਰਵੇ ਲਈ COPYING "
 "ਫਾਇਲ ਵੇਖੋ।\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ (aalam users sf net)\n"
 "Punjab Open Source Softrware Tercel\n"
 "http://www.satluj.com";
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ਵਰਤੋਂ: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ਵਰਤੋਂ: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ਵਰਤੋਂ: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ਵਰਤੋਂ: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ਵਰਤੋਂ: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ਵਰਤੋਂ: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ਵਰਤੋਂ: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "ਗਲਤ ਮੁੱਲ\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਕੈਸ ਸਾਫ਼\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ਵਰਤੋਂ: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ਵਰਤੋਂ: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ਗਲਤੀ: ਮੁੱਲ %s ਠੀਕ ਸੰਰਚਨਾ ਮੁੱਲ ਨਹੀਂ ਹੈ।\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1555,319 +1556,320 @@ msgstr ""
 "ਸਹਿਯੋਗੀ ਕਮਾਂਡਾਂ:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ਵਰਤੋਂ: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਤਬਦੀਲੀ ਢੰਗ Ascii ਬਣਾਓ (ਸਿਰਫ FTP ਰਾਹੀਂ ਹੀ)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਤਬਦੀਲੀ ਢੰਗ ਬਾਈਨਰੀ ਬਣਾਓ (ਸਿਰਫ਼ FTP ਰਾਹੀਂ ਹੀ)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "ਰਿਮੋਟ ਕਾਰਜਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਤਬਦੀਲ"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "ਰਿਮੋਟ ਫਾਇਲ ਦੇ ਅਧਿਕਾਰ ਤਬਦੀਲ"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ਉਪਲੱਬਧ ਚੋਣ: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "ਰਿਮੋਟ ਸਾਇਟ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਬੰਦ"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "ਰਿਮੋਟ ਫਾਇਲ ਹਟਾਓ"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "ਮੌਜੂਦਾ ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "ਰਿਮੋਟ ਫਾਇਲ਼ ਡਾਊਨਲੋਡ"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "ਇਹ ਮੱਦਦ ਸਕਰੀਨ ਵੇਖੋ"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "ਲੋਕਲ ਕਾਰਜਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਤਬਦੀਲ"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "ਲੋਕਲ ਫਾਇਲ਼ ਦੇ ਅਧਿਕਾਰ ਤਬਦੀਲ"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ਲੋਕਲ ਫਾਇਲ ਹਟਾਓ"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "ਮੌਜੂਦਾ ਲੋਕਲ ਡਾਇਰਕਟਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "ਮੌਜੂਦਾ ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ ਵੇਖਾਓ"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "ਲੋਕਲ ਫਾਇਲ ਨਾਂ ਤਬਦੀਲ"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ ਹਟਾਓ"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "ਲੋਕਲ ਫਾਇਲਾਂ ਭੇਜੋ"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "ਰਿਮੋਟ ਸਾਇਟ ਤੇ ਕੁਨੈਕਸ਼ਨ ਖੋਲ੍ਹੋ"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "ਮੌਜੂਦਾ ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ ਵੇਖੋ"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP ਬੰਦ ਕਰੋ"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "ਰਿਮੋਟ ਫਾਇਲ ਨਾਂ ਬਦਲੋ"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ ਹਟਾਓ"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਮੁੱਲ਼ ਵੇਖਾਓ। ਤੁਸੀਂ ਇਹ ਮੁੱਲ var=val ਰਾਹੀਂ ਦੇ ਸਕਦੇ ਹੋ"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "ਸਾਇਟ ਖਾਸ ਕਮਾਂਡ ਚਲਾਓ"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ਗਲਤੀ: ਕਮਾਂਡ ਪਛਾਣੀ ਨਹੀਂ ਗਈ\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ਫਾਇਲ %s ਨੂੰ ਹੋਸਟ %s ਤੋਂ ਛੱਡਿਆ ਜਾਦਾ ਹੈ\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s ਹੋਸਟ ਤੇ ਤਬਦੀਲੀ ਰੋਕੀ ਜਾ ਰਹੀ ਹੈ\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: ਕੁਝ ਵੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਰੋਕੋ ਬਟਨ ਦਬਾਓ ਜੀ।\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "ਬੁੱਕਮਾਰਕ ਚਲਾਓ"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ: ਤੁਹਾਨੂੰ ਬੁੱਕਮਾਰਕ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ: ਬੁੱਕਮਾਰਕ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕੇਗਾ, ਕਿਉਕਿ ਇਹ ਤਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
+msgstr ""
+"ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ: ਬੁੱਕਮਾਰਕ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕੇਗਾ, ਕਿਉਕਿ ਇਹ ਤਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ: ਤੁਹਾਨੂੰ ਹੋਸਟ ਦਾ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1877,31 +1879,31 @@ msgstr ""
 "ਤੁਸੀਂ ਆਈਟਮਾਂ ਨੂੰ ਇੱਕ ਸਬਮੇਨੂ ਵਿੱਚ ਇੱਕ / ਦੇ ਕੇ ਵੱਖ ਵੱਖ ਕਰ ਸਕਦੇ ਹੋ\n"
 "(ਜਿਵੇਂ: Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "ਤੁਹਾਨੂੰ ਬੁੱਕਮਾਰਕ ਲਈ ਇੱਕ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਨਾਂ ਦਿਓ"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "ਨਵੀਂ ਆਈਟਮ"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "ਨਵੀਂ ਆਈਟਮ ਬਣਾਉਣ ਲਈ ਨਾਂ ਦਿਓ"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1910,106 +1912,99 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਬੁੱਕਮਾਰਕ %s ਅਤੇ ਅਧੀਨ ਬੁੱਕਮਾਰਕ ਹਟਾਉਣ\n"
 "ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ਬੁੱਕਮਾਰਕ ਹਟਾਓ"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "ਬੁੱਕਮਾਰਕ"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "ਐਂਟਰੀ ਸੋਧ"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ਹੋਸਟ-ਨਾਂ:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "ਪੋਰਟ:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "ਪਰੋਟੋਕਾਲ:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "ਰਿਮੋਟ ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "ਅਕਾਊਂਟ:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr " ਰੱਦ"
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ਫਾਇਲ(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ਫਾਇਲ/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/ਫਾਇਲ/ਨਵਾਂ ਫੋਲਡਰ(_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/ਫਾਇਲ/ਨਵੀਂ ਆਈਟਮ(_I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/ਫਾਇਲ/ਹਟਾਓ(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/ਫਾਇਲ/ਵਿਸ਼ੇਸਤਾ(_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ਫਾਇਲ/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/ਫਾਇਲ/ਬੰਦ ਕਰੋ(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "ਬੁੱਕਮਾਰਕ ਸੋਧ"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2017,91 +2012,90 @@ msgstr ""
 "ਹੁਣ ਤੁਸੀਂ ਆਪਣੀ ਫਾਇਲਾਂ ਲਈ ਗੁਣ ਵੀ ਅਡਜੱਸਟ ਕਰ ਸਕਦੇ ਹੋ\n"
 "ਨੋਟ: ਸਭ ftp ਸਰਵਰ chmod ਫੀਚਰ ਲਈ ਸਹਿਯੋਗ ਨਹੀਂ ਹੁੰਦੇ"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "ਖਾਸ"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "ਸਟਿੱਕੀ"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ਯੂਜ਼ਰ"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "ਪੜ੍ਹਨ"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "ਲਿਖਣ"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ਚਲਾਉਣ"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "ਗਰੁੱਪ"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "ਕੀ ਤੁਸੀਂ %ld ਫਾਇਲਾਂ ਤੇ %ld ਡਾਇਰੈਕਟਰੀਆਂ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "ਕੀ ਤੁਸੀਂ %ld ਫਾਇਲਾਂ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹੋ"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "ਕੀ ਤੁਸੀਂ %ld ਡਾਇਰੈਕਟਰੀਆਂ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ਫਾਇਲਾਂ/ਡਾਇਰੈਕਟਰੀਆਂ ਹਟਾਓ"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "ਕੁਨੈਕਟ"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s ਪ੍ਰਾਪਤ ਕੀਤਾ\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "ਚੁੱਕੋ-ਤੇ-ਸੁੱਟੋ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ਬਾਹਰ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2109,468 +2103,455 @@ msgstr ""
 "ਫਾਇਲ ਤਬਦੀਲੀ ਚੱਲ ਰਹੀ ਹੈ।\n"
 "ਕੀ ਤੁਸੀਂ ਬੰਦ ਕਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "ਟਿਕਾਣਾ ਖੋਲ੍ਹੋ"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "ਕੁਨੈਕਟ ਲਈ URL ਦਿਓ"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Window _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Window _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/ਬਾਈਨਰੀ(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/ਮੇਰੀ ਪਸੰਦ(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/ਬਾਹਰ(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/ਲੋਕਲ(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/ਲੋਕਲ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/ਲੋਕਲ/URL ਖੋਲ੍ਹੋ(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/ਲੋਕਲ/ਡਿਸ-ਕੁਨੈਕਟ ਕਰੋ(_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/ਲੋਕਲ/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/ਲੋਕਲ/_Filespec ਬਦਲੋ..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/ਲੋਕਲ/ਚੁਣੇ ਵੇਖੋ(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/ਲੋਕਲ/ਸਭ ਚੁਣੋ(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/ਲੋਕਲ/ਸਭ ਫਾਇਲਾਂ ਚੁਣੋ"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/ਲੋਕਲ/ਸਭ ਨਾ ਚੁਣੋ"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/ਲੋਕਲ/ਡਾਇਰੈਕਟਰੀ ਲਿਸਟ ਸੰਭਾਲੋ.."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/ਲੋਕਲ/ਸਾਇਟ ਕਮਾਂਡ ਭੇਜੋ..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/ਲੋਕਲ/ਡਾਇਰੈਕਟਰੀ ਬਦਲੋ(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/ਲੋਕਲ/ਅਧਿਕਾਰ(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/ਲੋਕਲ/ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/ਲੋਕਲ/ਨਾਂ-ਬਦਲੋ(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/ਲੋਕਲ/ਹਟਾਓ(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/ਲੋਕਲ/ਸੋਧ(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/ਲੋਕਲ/ਵੇਖੋ(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/ਲੋਕਲ/ਤਾਜ਼ਾ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/ਰਿਮੋਟ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/ਰਿਮੋਟ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/ਰਿਮੋਟ/URL ਖੋਲ੍ਹੋ(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/ਰਿਮੋਟ/ਡਿਸਕ-ਕੁਨੈਕਟ ਕਰੋ(_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/ਰਿਮੋਟ/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/ਰਿਮੋਟ/ਫਾਇਲ ਪਛਾਣ ਬਦਲੋ(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/ਰਿਮੋਟ/ਚੁਣੇ ਵੇਖੋ(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/ਰਿਮੋਟ/ਸਭ ਚੁਣੋ(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/ਰਿਮੋਟ/ਸਭ ਫਾਇਲਾਂ ਚੁਣੋ"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/ਰਿਮੋਟ/ਸਭ ਨਾ-ਚੁਣੇ"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/ਰਿਮੋਟ/ਡਾਇਰੈਕਟਰੀ ਲਿਸਟ ਸੰਭਾਲੋ..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/ਰਿਮੋਟ/ਸਾਈਟ ਕਮਾਂਡ ਭੇਜੋ..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/ਰਿਮੋਟ/ਡਾਇਰੈਟਰੀ ਬਦਲੋ(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/ਰਿਮੋਟ/ਅਧਿਕਾਰ(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/ਰਿਮੋਟ/ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/ਰਿਮੋਟ/ਨਾਂ-ਬਦਲੋ(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/ਰਿਮੋਟ/ਹਟਾਓ(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/ਰਿਮੋਟ/ਸੋਧ(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/ਰਿਮੋਟ/ਵੇਖੋ(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/ਰਿਮੋਟ/ਤਾਜ਼ਾ ਕਰੋ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/ਬੁੱਕਮਾਰਕ(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/ਬੁੱਕਮਾਰਕ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/ਬੁੱਕਮਾਰਕ/ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/ਬੁੱਕਮਾਰਕ/ਬੁੱਕਮਾਰਕ ਸੋਧ"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/ਬੁੱਕਮਾਰਕ/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/ਟਰਾਂਸਫਰ(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/ਟਰਾਂਸਫਰ/ਵੱਖ ਕਰੋ"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/ਟਰਾਂਸਫਰ/ਸਟਾਰਟ(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/ਟਰਾਂਸਫਰ/ਰੋਕੋ(_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/ਟਰਾਂਸਫਰ/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/ਟਰਾਂਸਫਰ/ਮੌਜੂਦਾ ਫਾਇਲ ਛੱਡੋ(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/ਟਰਾਂਸਫਰ/ਫਾਇਲ ਹਟਾਓ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/ਟਰਾਂਸਫਰ/ਫਾਇਲ ਉੱਤੇ ਭੇਜੋ(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/ਟਰਾਂਸਫਰ/ਫਾਇਲ ਹੇਠਾਂ ਭੇਜੋ(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/ਟਰਾਂਸਫਰ/ਫਾਇਲਾਂ ਲਵੋ(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/ਟਰਾਂਸਫਰ/ਫਾਇਲਾਂ ਰੱਖੋ(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/ਲਾਗ(_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/ਲਾਗ/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/ਲਾਗ/ਸਾਫ਼ ਕਰੋ(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/ਲਾਗ/ਵੇਖੋ(_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/ਲਾਗ/ਸੰਭਾਲੋ(_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ਟੂਲ(_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ਟੂਲ/ਵੱਖ ਕਰੋ"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/ਟੂਲ/ਵਿੰਡੋ ਤੁਲਨਾ(_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/ਟੂਲ/ਕੈਸ਼ ਸਾਫ਼ ਕਰੋ(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/ਮੱਦਦ"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/ਮੱਦਦ/ਵੱਖ ਕਰੋ"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/ਮੱਦਦ/ਇਸ ਬਾਰੇ(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "ਹੋਸਟ: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "ਹੋਸਟ(_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "ਪੋਰਟ: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "ਯੂਜ਼ਰ: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "ਯੂਜ਼ਰ(_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "ਪਾਸਵਰਡ: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "ਕਮਾਂਡ: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ਫਾਇਲ ਨਾਂ"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "ਆਕਾਰ"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ਤਰੱਕੀ"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ਗਲਤੀ: ਤਹਾਨੂੰ ਇਸ ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਲਈ ਦੇਣਾ ਲਾਜ਼ਮੀ\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "ਤਾਜ਼ਾ"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਦਿਓ"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "ਇਸ ਸਾਇਟ ਲਈ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਦਿਓ ਜੀ"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "ਇਸ ਸਾਇਟ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਿਓ ਜੀ"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ ਗਈ ਹੈ...ਤੁਹਾਨੂੰ ਸਤਰ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "ਬਣਾਉਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਦਿਓ"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "ਨਾਂ ਬਦਲੋ"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "ਕੀ ਤੁਸੀਂ %s ਦਾ ਨਾਂ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "ਸਾਇਟ"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ਸਾਇਟ-ਖਾਸ ਕਮਾਂਡ ਦਿਓ"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE ਨਾਲ ਪਹਿਲਾਂ ਜੋੜੋ"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "ਉੱਤੇ ਲਿਖੋ"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "ਮੁੜ-ਵਿਚਾਰ"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "ਛੱਡੋ"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "ਕਾਰਵਾਈ"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ਫਾਇਲਾਂ ਟਰਾਂਸਫਰ"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2578,72 +2559,70 @@ msgstr ""
 "ਹੇਠ ਦਿੱਤੀ ਫਾਇਲ ਲੋਕਲ ਤੇ ਰਿਮੋਟ ਦੋਵੇਂ ਕੰਪਿਊਟਰਾਂ ਤੇ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਚੁਣੋ ਕਿ\n"
 "ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ਫਾਇਲ ਛੱਡੋ"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "ਸਭ ਚੁਣੋ"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "ਸਭ ਨਾ-ਚੁਣੇ"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec ਬਦਲੀ: ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ...ਤੁਹਾਨੂੰ ਇੱਕ ਲਾਈਨ ਦੇਣੀ ਪਵੇਗੀ\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec ਤਬਦੀਲ"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ਗਲਤੀ: %s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "ਡਾਇਰੈਟਰੀ ਸੂਚੀ ਸੰਭਾਲੋ"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ਗਲਤੀ: %s ਤੇ ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "%s ਤੇ ਸਫਲਤਾਪੂਰਕ ਲਾਗ ਫਾਇਲ ਲਿਖੀ ਗਈ\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "ਲਾਗ ਸੰਭਾਲੋ"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr ""
-"COPYING ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਨਹੀਂ ਲੱਭੀਆਂ ਹਨ। ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ %s ਜਾਂ %s ਵਿੱਚ ਤਾਂ "
-"ਨਹੀਂ"
+msgstr "COPYING ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਨਹੀਂ ਲੱਭੀਆਂ ਹਨ। ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ %s ਜਾਂ %s ਵਿੱਚ ਤਾਂ ਨਹੀਂ"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP ਬਾਰੇ"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2654,98 +2633,78 @@ msgstr ""
 "Copyright (C) ੧੯੯੮-੨੦੦੭ Brian Masney <masneyb gftp org>\n"
 "ਮੁੱਖ ਸਫਾ: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ਲਾਇਸੈਸ ਸ਼ਰਤਾਂ"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  ਬੰਦ"
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "ਵਿੰਡੋ ਤੁਲਨਾ"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਬੰਦ"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲ਼ਾਂ"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (ਕੈਸ ਕੀਤੇ) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "ਕੁਨੈਕਟ ਨਹੀਂ"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "ਫਾਇਲ %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ਰਿਮੋਟ ਸਾਇਟ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ਇਹ ਪ੍ਰੋਟੋਕਾਲ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਗੁਣ ਉਪਲੱਬਧ ਨਹੀ\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: ਤੁਹਾਨੂੰ ਇੱਕ ਹੀ ਇਕਾਈ ਚੁਣਨੀ ਚਾਹੀਦੀ ਹੈ\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਇਕਾਈ ਚੁਣਨੀ ਚਾਹੀਦੀ ਹੈ\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "ਬਦਲੋ"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "ਸ਼ਾਮਲ"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ਰੱਦ"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr " ਹਾਂ "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr " ਨਹੀਂ "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੂਚੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  ਰੋਕੋ "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2754,109 +2713,89 @@ msgstr ""
 "%ld ਡਾਇਰੈਕਟਰੀਆਂ ਅਤੇ\n"
 "%ld ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਹੋਈਆਂ"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP ਗਲਤੀ: ਫਾਇਲ %s ਨੂੰ %s ਜਾਂ %s ਵਿੱਚ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "ਹੋਸਟ ਸੋਧ"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "ਹੋਸਟ ਸ਼ਾਮਿਲ"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "ਕਿਸਮ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "ਕਿਸਮ(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "ਨੈੱਟਮਾਸਕ"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "ਨੈੱਟਮਾਸਕ(_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "ਡੋਮੇਨ(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "ਨੈੱਟਮਾਸਕ"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "ਲੋਕਲ ਹੋਸਟ"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "ਸੋਧ"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ਚੋਣ"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "ਲਾਗੂ"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "ਫਾਇਲ਼ ਨਾਂ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "ਫਾਇਲ ਪ੍ਰਾਪਤੀ: ਰਿਮੋਟ ਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ਗਲਤੀ: ਅਗਲੇ ਕਾਰਜ %d ਦਾ ਜਵਾਬ %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "ਅਗਲਾ ਕਾਰਜ %d ਸਫਲਤਾਪੂਰਕ ਬੰਦ ਹੋ ਗਿਆ\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "ਗਲਤੀ: ਅਗਲਾ ਕਾਰਜ %d ਠੀਕ ਤਰਾਂ ਬੰਦ ਨਹੀਂ ਹੋਇਆ\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ਗਲਤੀ: ਫਾਇਲ %s ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ਫਾਇਲ %s ਤਬਦੀਲ ਨਹੀਂ ਹੈ\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2865,117 +2804,157 @@ msgstr ""
 "ਫਾਇਲ਼ %s ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
 "ਕੀ ਤੁਸੀਂ ਅੱਪਲੋਡ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "ਫਾਇਲ ਸੋਧ"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ਸਮਾਪਤ"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: 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 ਬਾਕੀ ਸਮਾਂ"
+msgstr ""
+"ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %2s ਵਿੱਚੋਂ %1s ਇਸ ਤੇ %.2fKB/s, %02d:%02d:%02d ਬਾਕੀ ਸਮਾਂ"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%2$s ਵਿੱਚੋਂ %1$s ਭੇਜੇ, ਟਰਾਂਸਫਰ ਰੁਕੀ, ਅਣਜਾਣ ਸਮਾਂ ਬਾਕੀ"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s ਪ੍ਰਾਪਤੀ %s ਵਿੱਚੋਂ, ਤਬਦੀਲੀ ਸਥਿਰ ਹੋਈ, ਅਣਜਾਣਾ ਸਮਾਂ ਬਾਕੀ ਹੈ"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "ਅਣਜਾਣ ਪ੍ਰਤੀਸ਼ਤ ਮੁਕੰਮਲ। (ਫਾਇਲ਼ %ld, %ld ਵਿੱਚੋਂ)"
 
-#: ../src/gtk/transfer.c:804
+#: 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:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "ਫਾਇਲ-ਨਾਂ ਲਏ ਜਾ ਰਹੇ ਹਨ...%s ਬਾਇਟ"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "ਵੇਖੋ"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "ਸੋਧ"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "ਵੇਖੋ: ਹੋਰ ਕਾਰਜ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "ਚੱਲ ਰਿਹਾ ਕਾਰਜ: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ਨੂੰ %s ਨਾਲ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ਫਾਇਲ %s ਵੇਖੀ ਜਾ ਰਹੀ ਹੈ\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "ਵੇਖੋ: ਫਾਇਲ %s ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "ਕੰਟਰੋਲਿੰਗ ਟਰਮੀਨਲ %s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ (%s ਸਰੋਤ ਅਕਾਰ, %s ਨਿਸ਼ਾਨਾ ਅਕਾਰ):\n"
-"ਉੱਤੇ ਲਿਖੋ(o), ਮੁੜ-ਪ੍ਰਾਪਤ(r), ਅਧੂਰਾ ਛੱਡੋ(s), ਸਭ ਉੱਤੇ ਲਿਖੋ(O), ਸਭ ਮੁੜ-ਪ੍ਰਾਪਤ(R), ਸਭ ਛੱਡੋ"
-"(S): (%c)"
+"ਉੱਤੇ ਲਿਖੋ(o), ਮੁੜ-ਪ੍ਰਾਪਤ(r), ਅਧੂਰਾ ਛੱਡੋ(s), ਸਭ ਉੱਤੇ ਲਿਖੋ(O), ਸਭ ਮੁੜ-ਪ੍ਰਾਪਤ(R), ਸਭ ਛੱਡੋ(S): "
+"(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr " ਰੱਦ"
+
+#~ msgid "Host: "
+#~ msgstr "ਹੋਸਟ: "
+
+#~ msgid "User: "
+#~ msgstr "ਯੂਜ਼ਰ: "
+
+#~ msgid "  Close  "
+#~ msgstr "  ਬੰਦ"
+
+#~ msgid "Add"
+#~ msgstr "ਸ਼ਾਮਲ"
+
+#~ msgid "Cancel"
+#~ msgstr "ਰੱਦ"
+
+#~ msgid "  Yes  "
+#~ msgstr " ਹਾਂ "
+
+#~ msgid "  No  "
+#~ msgstr " ਨਹੀਂ "
+
+#~ msgid "Type:"
+#~ msgstr "ਕਿਸਮ:"
+
+#~ msgid "Network Address"
+#~ msgstr "ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ"
+
+#~ msgid "_Edit"
+#~ msgstr "ਸੋਧ(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "ਲਾਗੂ"
 
 #~ msgid "\n"
 #~ msgstr "\n"
diff --git a/po/pl.po b/po/pl.po
index 9d05c0b..16f7602 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-12 17:59+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2013-06-12 18:00+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
@@ -26,40 +26,39 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Nieprawidłowy adres URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Błąd: nieprawidłowy wiersz %s w pliku indeksu pamięci podręcznej\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Błąd: nie można utworzyć katalogu %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Błąd: nie można utworzyć pliku tymczasowego: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Błąd podczas zamykania deskryptora pliku: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Błąd: nie można zmienić położenia w pliku %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -67,49 +66,49 @@ msgstr ""
 "Błąd podczas konwertowania łańcucha \"%s\" z zestawu znaków %s do zestawu "
 "%s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Błąd: nie można otworzyć lokalnego pliku %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Błąd: nie można zapisać do gniazda: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Błąd: nie można odczytać z gniazda: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Błąd programu gFTP: Błędna nazwa pliku zakładek %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Ostrzeżenie: nie można znaleźć głównego pliku zakładek %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Błąd programu gFTP: nie można otworzyć pliku zakładek %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Ostrzeżenie gFTP: pominięto wiersz %d w pliku zakładek: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 "Ostrzeżenie gFTP: wiersz %d nie zawiera wystarczającej liczby parametrów\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -119,7 +118,7 @@ msgstr ""
 "przekierowania przez serwer pośredniczący (jeśli jest dostępny). Składnia: "
 "dont_use_proxy=.domena lub dont_use_proxy=numer sieci/maska"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -128,52 +127,52 @@ msgstr ""
 "przeglądarki. Uwaga: wszystkie polecenia poza rozszerzeniem pliku są "
 "opcjonalne"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Błąd programu gFTP: błędna nazwa pliku konfiguracji %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Błąd programu gFTP: nie można utworzyć katalogu %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Błąd programu gFTP: nie można znaleźć głównego pliku konfiguracji %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Wykonano polecenie make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Błąd programu gFTP: nie można otworzyć pliku konfiguracji %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "Wyłączanie z powodu błędów analizy w wierszu %d w pliku konfiguracji\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Ostrzeżenie gFTP: pominięto wiersz %d w pliku konfiguracji: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Błąd programu gFTP: błędna nazwa pliku dziennika %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Ostrzeżenie gFTP: nie można otworzyć %s do zapisu: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -182,7 +181,7 @@ msgstr ""
 "<masneyb gftp org>. Uwaga: wszystkie komentarze dodane do tego pliku ZOSTANĄ "
 "zastąpione"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -194,7 +193,7 @@ msgstr ""
 "przez kogoś podpatrującego zza ramienia podczas modyfikowania tego pliku. "
 "Wcześniej wszystkie hasła były przechowywane w zwykłym tekście."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -205,96 +204,95 @@ msgstr ""
 "zastąpione. Jeśli wpis zawiera (*) w komentarzu, nie można go zmienić z "
 "poziomu programu gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nieznany>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "KRYTYCZNY błąd programu gFTP: nie znaleziono opcji konfiguracji \"%s\" w "
 "globalnej tabeli skrótów\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Błąd: nie można wysłać pliku %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Błąd: nie można zapisać do pliku %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Błąd: błąd podczas zamykania pliku: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Uszkodzona lista plików z serwera FSP: %s\n"
 
-#: ../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
+#: 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 "nieznany"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nie można pobrać listy katalogów FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Pomyślnie zmieniono katalog na %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nie można zmienić katalogu na %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Pomyślnie usunięto %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Błąd: nie można usunąć katalogu %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Błąd: nie można usunąć pliku %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Pomyślnie utworzono katalog %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Pomyślnie zmieniono nazwę %s na %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Błąd: nie można zmienić nazwy %s na %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -302,7 +300,7 @@ msgstr ""
 "Obsługa FTPS jest niedostępna, ponieważ nie skompilowano obsługi SSL. "
 "Przerywanie połączenia.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -310,107 +308,105 @@ msgstr ""
 "Obsługa HTTPS jest niedostępna, ponieważ nie skompilowano obsługi SSL. "
 "Przerywanie połączenia.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nie można pobrać bieżącego katalogu roboczego: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Pomyślnie zmieniono lokalny katalog na %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Nie można zmienić lokalnego katalogu na %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Błąd: nie można skrócić lokalnego pliku %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nie można pobrać lokalnej listy katalogów %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Pomyślnie zmieniono tryb %s na %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Błąd: nie można zmienić trybu %s na %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Pomyślnie zmieniono czas modyfikacji %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Błąd: nie można zmienić czasu modyfikacji %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalny system plików"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "użycie: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "brak"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "plik"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "rozmiar"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "użytkownik"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupa"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "data i czas"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atrybuty"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "malejąco"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "rosnąco"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Ogólne"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Program przeglądarki:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -418,27 +414,27 @@ msgstr ""
 "Domyślny program używany do przeglądania plików. Jeśli pole pozostanie "
 "puste, użyta zostanie wewnętrzna przeglądarka plików"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Program edytora:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Domyślny program używany do modyfikacji plików."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maksymalny rozmiar okna dziennika:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maksymalny rozmiar okna dziennika w bajtach dla portu GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Zdalne zestawy znaków:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -446,11 +442,11 @@ msgstr ""
 "Rozdzielona przecinkami lista zestawów znaków, które zostaną wypróbowane do "
 "konwersji zdalnych komunikatów do bieżących ustawień lokalnych"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Zdalna zmienna LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -458,175 +454,175 @@ msgstr ""
 "Wartość LC_TIME dla zdalnych serwerów. Dzięki tej zmiennej można poprawnie "
 "analizować daty w listach katalogów."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Pamięć podręczna TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Liczba sekund utrzymywania wpisów w pamięci podręcznej przed wygaśnięciem."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Dołączanie przesyłanych plików"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Dołączanie przesyłanych plików do już istniejących"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Jedno przesyłanie na raz"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Wykonywać tylko jedno przesyłanie na raz?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Domyślne zastępowanie"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Domyślne zastępowanie plików lub wznawianie przesyłania plików"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Zachowywanie uprawnień plików"
 
-#: ../lib/options.h:80
+#: lib/options.h:80
 msgid "Preserve file permissions of transferred files"
 msgstr "Zachowywanie uprawnień przesyłanych plików"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Zachowywanie czasów plików"
 
-#: ../lib/options.h:85
+#: lib/options.h:85
 msgid "Preserve file times of transferred files"
 msgstr "Zachowywanie czasów przesyłanych plików"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Odświeżanie po każdym przesyłaniu"
 
-#: ../lib/options.h:90
+#: lib/options.h:90
 msgid "Refresh the listbox after each file is transferred"
 msgstr "Odświeżanie listy plików po przesłaniu każdego pliku"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Katalogi na początku listy"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Umieszczanie katalogów przed plikami"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Wyświetlanie ukrytych plików"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Wyświetlanie ukrytych plików w listach"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Stan przesyłania w tytule"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Wyświetlanie stanu przesyłania plików w pasku tytułu"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Rozpoczynanie przesyłania plików"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Automatyczne rozpoczynanie przesyłania plików po dodaniu ich do kolejki"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Ręczne polecenia w GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Umożliwia ręczne podawanie poleceń w GUI (funkcje takie jak w porcie "
 "tekstowym)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Zapamiętanie ostatniego katalogu"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Zapisywanie ostatniego lokalnego i zdalnego katalogu podczas zamykania "
 "programu"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Łączenie się ze zdalnym serwerem podczas uruchamiania"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Automatyczne łączenie się ze zdalnym serwerem podczas uruchamiania programu."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Sieć"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Ograniczenie czasu sieci:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Ograniczenie czasu oczekiwania na dane odbierane/wysyłane przez sieć. To NIE "
 "jest ograniczenie czasu bezczynności."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Liczba prób połączenia:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Liczba automatycznych powtórzeń połączenia. Ustawienie na 0 powoduje "
 "powtarzanie bez ograniczeń"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Okres czasu między powtórzeniami:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Czas w sekundach między próbami połączenia"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maksymalnie KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Maksymalna prędkość przesyłania plików w KB/s (ustawienie na 0 wyłącza)."
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Rozmiar bloku przesyłania:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
@@ -634,19 +630,19 @@ msgstr ""
 "Rozmiar bloku użytego podczas przesyłania plików. Powinno być "
 "wielokrotnością 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Domyślny protokół:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Domyślnie używany port"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Obsługa IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -654,27 +650,27 @@ msgstr ""
 "Określa czynność, wykonywaną po dwukrotnym naciśnięciu na nazwie pliku w "
 "listach plików. 0=Podgląd pliku, 1=Edycja pliku, 2=Przesłanie pliku"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Domyślna szerokość listy lokalnych plików"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Domyślna szerokość listy zdalnych plików"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Domyślna wysokość lokalnych/zdalnych list plików"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Domyślna wysokość listy przesyłania"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Domyślna wysokość okna dziennika"
 
-#: ../lib/options.h:177
+#: 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."
@@ -682,15 +678,15 @@ msgstr ""
 "Szerokość kolumny nazwy pliku w oknie przesyłania. Ustawienie jej na 0 "
 "spowoduje automatyczne dopasowanie rozmiaru kolumny."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Domyślna kolumna do sortowana"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortowanie rosnące lub malejące"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -699,7 +695,7 @@ msgstr ""
 "spowoduje automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 "
 "wyłącza tę kolumnę"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -708,7 +704,7 @@ msgstr ""
 "automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 wyłącza tę "
 "kolumnę"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -717,7 +713,7 @@ msgstr ""
 "spowoduje automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 "
 "wyłącza tę kolumnę"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -726,7 +722,7 @@ msgstr ""
 "automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 wyłącza tę "
 "kolumnę"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -735,7 +731,7 @@ msgstr ""
 "automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 wyłącza tę "
 "kolumnę"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -744,76 +740,76 @@ msgstr ""
 "automatyczne dopasowanie rozmiaru kolumny. Ustawienie jej na -1 wyłącza tę "
 "kolumnę"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Kolor poleceń wysyłanych do serwera"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Kolor poleceń odebranych z serwera"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Kolor komunikatów błędów"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Kolor reszty komunikatów dziennika"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokalne"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Zakładka"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Przesyłanie plików zostanie ograniczone do %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 "Błąd podczas ustawiania zmiennej LC_TIME na \"%s\". Przywracanie do \"%s\"\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Wczytywanie zawartości katalogu %s z pamięci podręcznej (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Wczytywanie zawartości katalogu %s z serwera (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -822,111 +818,111 @@ msgstr ""
 "Ostrzeżenie: usuwanie ścieżki z pliku \"%s\". Usunięta ścieżka (%s) nie "
 "zgadza się z bieżącym katalogiem (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Błąd: nie można zapisać do pamięci podręcznej: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Błąd: nie można znaleźć zakładki %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Błąd zakładek: wpis zakładki %s nie zawiera nazwy komputera\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokół \"%s\" nie jest obecnie obsługiwany.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Znaleziono rekursywne dowiązanie symboliczne %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Błąd: zdalne serwer %s jest rozłączony. Osiągnięto maksymalną liczbę "
 "powtórzeń... Rezygnowanie\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Błąd: zdalny serwera %s jest rozłączony. Ponowienie połączenie za %d sekund\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Błąd: nie można ustawić zamknięcia na fladze exec: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nie można otworzyć głównego PTY %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nie można utworzyć pary gniazd: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Błąd: nie można wykonać ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nie można rozdzielić drugiego procesu: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nazwa komputera pośrednika:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nazwa komputera zapory sieciowej"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port pośrednika:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port do podłączenia na zaporze sieciowej"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nazwa użytkownika pośrednika:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Nazwa użytkownika zapory sieciowej"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Hasło pośrednika:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Hasło zapory sieciowej"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Używanie HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Czy używać HTTP/1.1 lub HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -935,65 +931,65 @@ msgstr ""
 "Otrzymano błędną odpowiedź od serwera, rozłączanie\n"
 "Nieprawidłowy rozmiar fragmentu \"%s\" zwróconego przez zdalny serwer\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Rozłączanie z serwera %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Rozpoczęcie przesyłania pliku od pozycji "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nie można pobrać pliku %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Pobieranie zawartości katalogu...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Otrzymano błędną odpowiedź od serwera, rozłączanie\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Polecenie SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "użytkownik komputer"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "użytkownik komputer:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "UWIERZYTELNIENIE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "użytkownik komputer port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "użytkownik serwer BEZUWIERZYTELNIANIA"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Pośrednik HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Własny"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1001,19 +997,19 @@ msgstr ""
 "hasło, które zostanie użyte podczas logowanie się do zdalnego serwera FTP "
 "jako użytkownik anonimowy"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Konto pośrednika:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Konto zapory sieciowej (opcjonalnie)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Typ serwera pośredniczącego:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1030,11 +1026,11 @@ msgstr ""
 "(hasło), h (komputer), o (port) lub a (konto). Na przykład, aby podać "
 "użytkownika pośrednika, należy podać tekst %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorowanie adresów PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1046,11 +1042,11 @@ msgstr ""
 "to często wymagane przez routery podające swój wewnętrzny adres IP zamiast "
 "zewnętrznego w odpowiedzi PASV"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasywne przesyłanie plików"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1066,11 +1062,11 @@ msgstr ""
 "gFTP otworzy port po stronie klienta i zdalny serwer będzie próbował "
 "połączyć się z nim."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Rozwiązywanie zdalnych dowiązań symbolicznych (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1082,11 +1078,11 @@ msgstr ""
 "włączonej. Może być ona potrzebna jedynie wtedy, gdy zdalny serwer FTP nie "
 "obsługuje opcji -L do polecenia LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Przesyłanie plików w trybie ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
 "If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
@@ -1100,332 +1096,323 @@ msgstr ""
 "przesyłania z systemu UNIX na UNIX, bezpiecznie jest wyłączyć tę opcję. "
 "Podczas pobierania danych binarnych należy wyłączyć tę opcję."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Otrzymano z serwera nieprawidłowa odpowiedź \"%c\".\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Utworzenie gniazda IPv4 się nie powiodło: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Nie można znaleźć adresu IP w odpowiedzi PASV \"%s\"\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Ignorowanie adresu IP w odpowiedzi PASV, łączenie z %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Nie można utworzyć połączenia danych: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Nie można pobrać nazwy gniazda: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Nie można powiązać portu: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Nie można nasłuchiwać na porcie %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Utworzenie gniazda IPv6 się nie powiodło: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Błąd: połączenie nie jest typu IPv6. Przerywanie połączenia.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Nieprawidłowa odpowiedź EPSV \"%s\"\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Nie można pobrać adresu lokalnego gniazda: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nie można zaakceptować połączenia z serwera: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "razem"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Ostrzeżenie: nie można przeanalizować zawartości %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Wyszukiwanie %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Nie można znaleźć nazwy komputera %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Utworzenie gniazda się nie powiodło: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Próba połączenia z %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Nie można się połączyć z %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Połączono z %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 ""
 "Nie można znaleźć nazwy usługi %s/tcp. Proszę sprawdzić plik services\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Przekroczono czas oczekiwania na połączenie z %s\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Nie można pobrać flag gniazda: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Nie można ustawić gniazda w trybie nieblokującym: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nazwa programu SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Ścieżka do pliku wykonywalnego SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Dodatkowe parametry SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Dodatkowe parametry dla programu SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Wymaga użytkownika/hasła SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Wymaga użytkownika/hasła dla połączeń SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Uruchamianie programu %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Proszę podać długie hasło dla klucza RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Proszę podać długie hasło dla klucza \""
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Hasło"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "hasło"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(tak/nie)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Proszę podać PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Proszę podać hasło"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Proszę podać hasło SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Błąd: podano niepoprawne hasło\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: inicjowanie protokołu\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: wersja protokołu %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: otwieranie %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: zamykanie\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: otwieranie katalogu %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: odczytywanie katalogu\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: usuwanie pliku %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: tworzenie katalogu %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: usuwanie katalogu %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: rzeczywista ścieżka %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: atrybuty pliku\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: wykonywanie stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: wykonywanie chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: wykonywanie utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "Koniec pliku"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Nie ma takiego pliku ani katalogu"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Niepowodzenie"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Błędny komunikat"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Brak połączenia"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Utracone połączenie"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Nieobsługiwane działanie"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Serwer zwrócił nieznany komunikat"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Błąd: rozmiar komunikatu %d jest za duży\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Błąd: rozmiar komunikatu %d jest za duży z serwera\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1433,42 +1420,42 @@ msgstr ""
 "Wystąpił błąd podczas inicjowania połączenia SSH ze zdalnym serwerem. "
 "Komunikat o błędzie ze zdalnego serwera:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Otwieranie połączenia SSH z %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Pomyślnie zalogowano do serwera SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Mechanizm SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Plik entropii SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Plik entropii SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Długość ziarna entropii:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 "Maksymalna liczba bajtów użyta do zainicjowania ziarna dla mechanizmu SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Sprawdzanie partnera SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1481,11 +1468,11 @@ msgstr ""
 "Podmiot = %s\n"
 "Błąd %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Nie można uzyskać certyfikatu partnera\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1494,45 +1481,45 @@ msgstr ""
 "BŁĄD: komputer w certyfikacie SSL (%s) nie zgadza się z połączonym "
 "komputerem (%s). Przerywanie połączenia.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Nie można zainicjować biblioteki OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Błąd podczas wczytywania domyślnych certyfikatów SSL\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Błąd podczas ustawiania listy szyfrów (brak prawidłowych szyfrów)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Błąd: mechanizm SSL nie został zainicjowany\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Błąd podczas ustawiania połączenia SSL (obiekt BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Błąd podczas ustawiania połączenia SSL (obiekt SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Błąd certyfikatu partnera: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Działanie anulowane\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Oczekiwanie przez %d sekund przed kolejną próbą połączenia\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1543,7 +1530,7 @@ msgstr ""
 "rozprowadzać dalej na określonych warunkach. W celu uzyskania bliższych "
 "informacji należy zapoznać się z plikiem COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Tłumaczenie:\n"
@@ -1553,69 +1540,69 @@ msgstr ""
 "Piotr Drąg <piotrdrag gmail com>, 2008-2013\n"
 "Aviary.pl <gnomepl aviary pl>, 2008-2013"
 
-#: ../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
+#: 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 "Brak: nie połączono ze zdalnym serwerem\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "użycie: chmod <tryb> <plik>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "użycie: rename <stara nazwa> <nowa nazwa>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "użycie: delete <plik>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "użycie: rmdir <katalog>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "użycie: site <polecenie serwera>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "użycie: mkdir <nowy katalog>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "użycie: chdir <katalog>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Nieprawidłowy parametr\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Wyczyszczenie pamięci podręcznej katalogów\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "użycie: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "użycie: set [zmienna = wartość]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Błąd: zmienna %s nie jest prawidłową zmienną konfiguracji.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Błąd: zmienna %s jest niedostępna w tekstowej wersji gFTP\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1623,287 +1610,287 @@ msgstr ""
 "Obsługiwane polecenia:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "użycie: %s <określenie plików>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Wyświetla informacje o programie gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Ustawia bieżący tryb przesyłania na ASCII (tylko dla FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Ustawia bieżący tryb przesyłania na binarny (tylko dla FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Zmienia zdalny katalog roboczy"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Zmienia uprawnienia zdalnego pliku"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Dostępne opcje: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Rozłącza z zdalnym serwerem"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Usuwa zdalny plik"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Wyświetla zawartość bieżącego zdalnego katalogu"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Pobiera zdalne pliki"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Wyświetla ten ekran pomocy"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Zmienia lokalny katalog roboczy"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Zmienia uprawnienia lokalnego pliku"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Usuwa lokalny plik"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Wyświetla zawartość bieżącego lokalnego katalogu"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Tworzy lokalny katalog"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Wyświetla bieżący lokalny katalog"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Zmienia nazwę lokalnego pliku"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Usuwa lokalny katalog"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Tworzy zdalny katalog"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Wysyła lokalne pliki"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Otwiera połączenie ze zdalnym serwerem"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Wyświetla bieżący zdalny katalog"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Kończy działanie programu gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Zmienia nazwę zdalnego pliku"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Usuwa zdalny katalog"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Wyświetla zmienne pliku konfiguracyjnego. Zmienne można także ustawić za "
 "pomocą parametru: set zmienna=wartość"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "serwer"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Wykonuje polecenia specyficzne dla serwera"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Błąd: nie rozpoznano polecenia\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Pomyślnie przesłano %s z prędkością %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Pomijanie pliku %s na komputerze %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Zatrzymywanie przesyłania na komputerze %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nie można pobrać %s z %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1912,38 +1899,37 @@ msgstr ""
 "Nie można przesłać %d plików lub katalogów. Proszę sprawdzić dziennik, aby "
 "dowiedzieć się, które elementy nie zostały poprawnie przesłane."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: proszę nacisnąć przycisk zatrzymania, aby zrobić cokolwiek innego\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Uruchom zakładkę"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Dodanie zakładki: należy podać nazwę zakładki\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Dodanie zakładki: nie można dodać zakładki %s, ponieważ ta nazwa już "
 "istnieje\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Dodaj zakładkę"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Dodanie zakładki: należy podać nazwę komputera\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1953,31 +1939,31 @@ msgstr ""
 "Można rozdzielić elementy za pomocą znaku /, aby umieścić je w podmenu\n"
 "(np. Serwery linuksowe/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Zapamiętanie hasła"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Należy podać nazwę zakładki."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nowy katalog"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Proszę podać nazwę nowego katalogu"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nowy element"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Proszę podać nazwę nowego elementu"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1986,106 +1972,99 @@ msgstr ""
 "Na pewno usunąć zakładkę\n"
 "%s i wszystkie zakładki podrzędne?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Usuń zakładkę"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Edytuj wpis"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nazwa komputera:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Zdalny katalog:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokalny katalog:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Logowanie jako ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Anuluj  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Plik"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Plik/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Plik/Nowy _katalog..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Plik/Nowy _element..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Plik/_Usuń"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Plik/_Właściwości..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Plik/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Plik/_Zamknij"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Edytuj zakładki"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2093,91 +2072,90 @@ msgstr ""
 "Poniżej można dostosować atrybuty plików\n"
 "Uwaga: nie wszystkie serwery FTP obsługują funkcję chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Specjalne"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Lepkość"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Użytkownik"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Odczyt"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Zapis"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Wykonywanie"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Inni"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Usunąć %ld plików i %ld katalogów?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Usunąć %ld plików?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Usunąć %ld katalogów?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Usuwanie plików/katalogów"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Połącz"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Otrzymano adres URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Przeciągnij i upuść"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Zakończ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2185,468 +2163,455 @@ msgstr ""
 "Trwa przesyłanie plików.\n"
 "Zakończyć program?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Otwórz położenie"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Proszę podać adres URL dla połączenia"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Okno _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Okno _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_ASCII"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binarnie"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Plik/_Preferencje..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/Za_kończ"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokalne"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokalne/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokalne/_Otwórz położenie..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokalne/_Rozłącz"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokalne/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokalne/_Zmień określenie plików..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokalne/_Wyświetl zaznaczone"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokalne/Z_aznacz wszystko"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokalne/Zaznacz wszystkie pliki"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokalne/Odznacz wszystko"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalne/Zapisz listę zawartości katalogu..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalne/Wyślij polecenie SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokalne/_Zmień katalog"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokalne/_Uprawnienia..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Plik/_Nowy katalog..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokalne/Z_mień nazwę..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokalne/_Usuń"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokalne/_Edycja..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokalne/_Widok..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokalne/O_dśwież"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Zdalne"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Zdalne/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Zdalne/_Otwórz położenie..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Zdalne/_Rozłącz"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Zdalne/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Zdalne/_Zmień określenie plików..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Zdalne/_Wyświetl zaznaczone"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Zdalne/Z_aznacz wszystko"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Zdalne/Zaznacz wszystkie pliki"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Zdalne/Odznacz wszystkie"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Zdalne/Zapisz listę zawartości katalogu..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Zdalne/Wyślij polecenie SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Zdalne/_Zmień katalog"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Zdalne/_Uprawnienia..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Zdalne/_Nowy katalog..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Zdalne/Z_mień nazwę..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Zdalne/_Usuń..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Zdalne/_Edycja..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Zdalne/_Widok..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Zdalne/O_dśwież"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Zakładki"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Zakładki/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Zakładki/Dodaj _zakładkę"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Zakładki/Edytuj zakładki"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Zakładki/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Przesyłanie"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Przesyłanie/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Przesyłanie/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Przesyłanie/Z_atrzymaj"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Przesyłanie/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Przesyłanie/Pomiń _bieżący plik"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Przesyłanie/_Usuń plik"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Przesyłanie/Przenieś plik w gó_rę"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Przesyłanie/Przenieś plik w _dół"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Przesyłanie/_Pobierz pliki"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Przesyłanie/_Wyślij pliki"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Dziennik"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Dziennik/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Dziennik/Wy_czyść"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Dziennik/_Widok"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Dziennik/Zapi_sz..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Narzędzia"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Narzędzia/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Narzędzia/P_orównaj okna"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Narzędzia/Wy_czyść pamięć podręczną"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Pomoc"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Pomoc/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Pomoc/_O programie"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Komputer: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Komputer: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Użytkownik: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Użytkownik: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Hasło: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Polecenie: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atrybuty"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Błąd: należy podać komputer do połączenia się\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Proszę podać nazwę użytkownika"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Proszę podać nazwę użytkownika dla tego serwera"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Proszę podać hasło dla tego serwera"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Anulowano działanie... Należy podać tekst\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Tworzenie katalogu"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Proszę podać nazwę katalogu do utworzenia"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Na jaką nazwę zmienić %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Serwer"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Proszę podać polecenia specyficznego dla serwera"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Poprzedź poleceniem SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Pominięto"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Zastąp"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Wznów"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Pomiń"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Działanie"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Przesyłanie plików"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2654,59 +2619,59 @@ msgstr ""
 "Następujące pliki istnieją zarówno w lokalnym, jak i w zdalnym katalogu.\n"
 "Proszę wybrać dalsze działanie"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Błąd"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Pomiń plik"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Odznacz wszystko"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Zmiana określenia plików: anulowano działanie... Należy podać tekst\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Zmiana określenia plików"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Proszę podać nową specyfikację plików"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Błąd: nie można otworzyć %s do zapisania: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Zapis listy zawartości katalogu"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Błąd: błąd podczas zapisywania do %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Pomyślnie zapisano plik dziennika do %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Zapisz dziennik"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2715,11 +2680,11 @@ msgstr ""
 "Nie można znaleźć pliku umowy licencyjnej COPYING. Proszę się upewnić, że "
 "znajduje się ona w katalogu %s lub %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "O programie gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2730,27 +2695,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Oficjalna witryna: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "O programie"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Umowa licencyjna"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Zamknij  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Porównaj okna"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Rozłącz od zdalnego serwera"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2758,72 +2719,56 @@ msgstr ""
 "Łączy się z serwerem podaną w polu komputera. Jeśli pole komputera jest "
 "puste, zostanie wyświetlone okno dialogowe pozwalające na podanie adresu URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (W pamięci podręcznej) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nie połączono"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Błąd podczas otwierania pliku %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: nie połączono ze zdalnym serwerem\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ta funkcja nie jest dostępna używając tego protokołu\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: należy wybrać tylko jeden element\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: należy wybrać przynajmniej jeden element\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Zmień"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Tak  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nie  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Pobieranie zawartości katalogów"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " Zatrzymaj "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2832,109 +2777,89 @@ msgstr ""
 "Otrzymano %ld katalogów\n"
 "i %ld plików"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Błąd programu gFTP: Nie można znaleźć pliku %s w %s lub %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Edytuj komputer"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Dodaj komputer"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adres sieciowy"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Adres _sieciowy:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Maska sieci"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Maska si_eci:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domena:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Maska sieci"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Komputery lokalne"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Edycja"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Edycja"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opcje"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Zastosuj"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Pobieranie nazw plików..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Pobieranie plików: nie połączono ze zdalnym serwerem\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Błąd: proces potomny %d zwrócił %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Proces potomny %d pomyślnie zwrócił\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Błąd: proces potomny %d nie został poprawnie zakończony\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Błąd: nie można pobrać informacji o pliku %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Plik %s nie został zmieniony\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2943,113 +2868,116 @@ msgstr ""
 "Plik %s został zmieniony.\n"
 "Wysłać go?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Edytuj plik"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Zakończono"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Wysłano %s z %s z prędkością %.2fKB/s, przybliżony pozostały czas: %02d:%02d:"
 "%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Pobrano %s z %s z prędkością %.2fKB/s, przybliżony pozostały czas: %02d:%02d:"
 "%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Wysłano %s z %s, przesyłanie zatrzymane, nieznany pozostały czas"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Pobrano %s z %s, przesyłanie zatrzymane, nieznany pozostały czas"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Nieznany procent ukończenia (plik %ld z %ld)."
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "Zakończono %d%%, przybliżony pozostały czas: %02d:%02d:%02d (plik %ld z %ld)."
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Pobieranie nazw plików... %s bajtów"
 
-#: ../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
+#: 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 "Nie wybrano żadnego przesyłania plików\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Podgląd"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Edycja"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Podgląd: %s jest katalogiem. Nie można przedstawić podglądu.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Edycja: %s jest katalogiem. Nie można go modyfikować.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Edycja: należy podać edytor w oknie opcji\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Podgląd: nie można rozdzielić drugiego procesu: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Wykonywanie programu: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Otwieranie %s za pomocą %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Podgląd pliku %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Podgląd: nie można otworzyć pliku %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nie można otworzyć terminala kontrolującego %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Użytkownik [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -3057,5 +2985,41 @@ msgid ""
 "(%c)"
 msgstr ""
 "Plik %s już istnieje. (rozmiar źródłowy %s, rozmiar docelowy %s):\n"
-"(o)zastąp, (r)wznów, (s)pomiń, (O)zastąp wszystko, (R)wznów wszystko, "
-"(S)pomiń wszystko: (%c)"
+"(o)zastąp, (r)wznów, (s)pomiń, (O)zastąp wszystko, (R)wznów wszystko, (S)"
+"pomiń wszystko: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Anuluj  "
+
+#~ msgid "Host: "
+#~ msgstr "Komputer: "
+
+#~ msgid "User: "
+#~ msgstr "Użytkownik: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Zamknij  "
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Tak  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nie  "
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Network Address"
+#~ msgstr "Adres sieciowy"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edycja"
+
+#~ msgid "Apply"
+#~ msgstr "Zastosuj"
diff --git a/po/pt.po b/po/pt.po
index caac271..493ec3b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,90 +7,97 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.18\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-03-21 14:00+0000\n"
 "Last-Translator: Filipe Gomes <filipefgomes gmail com>\n"
 "Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s inválido\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Erro: Linha %s inválida no ficheiro de índice de cache\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 "Erro: Incapaz de criar directório %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Erro: Incapaz de criar ficheiro temporário: %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/cache.c:186 lib/cache.c:236 lib/config_file.c:157 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 "Erro ao fechar descritor de ficheiro: %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 "Erro: Incapaz de procurar no ficheiro %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3158
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Erro ao converter o texto '%s' da codificação de caracteres %s para %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Erro: Incapaz de abrir ficheiro local %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:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Erro: Incapaz de escrever para socket: %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:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Erro: Incapaz de ler de socket: %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 "Erro gFTP: Nome de ficheiro de marcadores inválido %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Aviso: Incapaz de encontrar ficheiro de marcadores principal %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 "Erro gFTP: Incapaz de abrir ficheiro de marcadores %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Aviso gFTP: A ignorar linha %d no ficheiro de marcadores: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Aviso gFTP: Linha %d não possui argumentos suficientes\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 "
@@ -100,7 +107,7 @@ msgstr ""
 "necessitam de passar pelo servidor proxy (se disponível). Sintaxe: "
 "dont_use_proxy=.domínio ou dont_use_proxy=endereço/máscara rede"
 
-#: ../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"
@@ -109,55 +116,55 @@ msgstr ""
 "visualização. Nota: Todos os argumentos excepto a extenção de ficheiro são "
 "opcionais"
 
-#: ../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 "Erro gFTP: Nome de ficheiro de configuração inválido %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 "Erro gFTP: Incapaz de criar directório %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 ""
 "Erro gFTP: Incapaz de encontrar ficheiro de configuração principal %s\n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Efectuou um `make install'?\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 "Erro gFTP: Incapaz de abrir ficheiro de configuração %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 ""
 "A terminar devido a erros de parseamento na linha %d do ficheiro de "
 "configuração\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 "Aviso gFTP: A ignorar linha %d no ficheiro de configuração: %s\n"
 
-#: ../lib/config_file.c:672
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Erro gFTP: Nome de ficheiro de log inválido %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 "Aviso gFTP: Incapaz de abrir %s para escrita: %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"
@@ -166,7 +173,7 @@ msgstr ""
 "<masneyb gftp org>. Aviso: Quaisquer comentários que adicione a este "
 "ficheiro SERÃO sobrepostos"
 
-#: ../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 "
@@ -179,7 +186,7 @@ msgstr ""
 "enquanto edita este ficheiro. Anteriormente, todas as senhas eram "
 "armazenadas em texto simples."
 
-#: ../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. "
@@ -190,94 +197,95 @@ msgstr ""
 "ficheiro SERÃO sobrepostos. Se uma entrada tiver um (*) no seu comentário, "
 "não a poderá alterar dentro do 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:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconhecido>"
 
-#: ../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 ""
 "Erro gFTP FATAL: Opção de configuração '%s' não foi encontrada na tabela "
 "interna global\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Erro: Incapaz de enviar ficheiro local %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Erro: Incapaz de escrever em %s: %s\n"
 
-#: ../lib/fsp.c:237
-#,  c-format
+#: lib/fsp.c:237
+#, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Erro: Erro ao fechar o ficheiro: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "O ficheiro de listagem do servidor FSP %s está corrupto\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 "desconhecido"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Incapaz de obter listagem de directório FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Directório alterado com sucesso para %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Incapaz de alterar directório para %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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s removido com sucesso\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 "Erro: Incapaz de remover directório %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:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Erro: Incapaz de remover ficheiro %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 "Directório %s criado com sucesso\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 renomeado para %s com sucesso\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 "Erro: Incapaz de renomear %s para %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"
@@ -285,7 +293,7 @@ msgstr ""
 "Suporte FTPS indisponível visto não ter sido compilado o suporte SSL. A "
 "abortar ligação.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -293,112 +301,105 @@ msgstr ""
 "Suporte HTTPS indisponível visto não ter sido compilado o suporte SSL. A "
 "abortar ligação.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Incapaz de obter directório de trabalho actual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Directório local alterado com sucesso para %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Incapaz de alterar dorectório local para %s: %s\n"
 
-#: ../lib/local.c:248
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Erro: Incapaz de truncar ficheiro local %s: %s\n"
 
-#: ../lib/local.c:434
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Incapaz de obter listagem de directório local %s: %s\n"
 
-#: ../lib/local.c:644
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Modo de %s alterado com sucesso para %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 "Erro: Incapaz de alterar modo de %s para %o: %s\n"
 
-#: ../lib/local.c:686
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Marca de tempo alterada com sucesso para %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 "Erro: Incapaz de alterar marca de tempo de %s: %s\n"
 
-#: ../lib/local.c:760
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema ficheiros local"
 
-#: ../lib/misc.c:407
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "utilização: 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
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nenhum"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "ficheiro"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "tamanho"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "utilizador"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datahora"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributos"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendente"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendente"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Geral"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Aplicação visualização:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -406,27 +407,27 @@ msgstr ""
 "A aplicação utilizada por omissão para ver ficheiros. Se estiver em branco, "
 "será utilizado o visualizador interno de ficheiros"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Aplicação edição:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "A aplicação por omissão utilizada para editar ficheiros."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Tamanho Máx. Janela Log:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "O tamanho máximo da janela de log em bytes para a conversão GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conjuntos de Caracteres Remotos:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -434,206 +435,213 @@ msgstr ""
 "Esta é uma lista separada por vírgulas de conjuntos de caracteres a utilizar "
 "para tentar converter as mensagens remotas para o local actual"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remoto:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 ""
-"Este é o valor do LC_TIME para o site remoto. Serve para que as datas "
-"possam ser analisadas correctamente nas listagens de directório."
+"Este é o valor do LC_TIME para o site remoto. Serve para que as datas possam "
+"ser analisadas correctamente nas listagens de directório."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "O número de segundos a manter entradas de cache antes de expirarem."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Acrescentar transferências ficheiros"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Acrescentar transferências de novos ficheiros às existentes"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Efectuar uma transferência de cada vez"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Apenas efectuar uma transferência de cada vez?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Por Omissão Sobrepor"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Por omissão sobepor ficheiros ou definir para retomar transferências de "
 "ficheiros"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Manter permissões de ficheiros"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Manter as permissões de ficheiros transferidos"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Manter hora de ficheiros"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Manter as horas de ficheiros transferidos"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Actualizar após transferência de cada ficheiro"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Actualizar a caixa de lista após a transferência de cada ficheiro"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordenar directórios primeiro"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Colocar primeiro os directórios e depois os ficheiros"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostrar ficheiros escondidos"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostrar ficheiros escondidos nas caixas de lista"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostrar estado da transferência no título"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostrar o estado da transferência do ficheiro na barra de título"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Iniciar transferências de ficheiros"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Iniciar automaticamente as transferências de ficheiros quando são postos em "
 "fila"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permitir comandos manuais no GUI"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permitir a introdução de comandos manuais no GUI (funções tais como o texto "
 "de porto)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Recordar último directório"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr "Guardar o último directório local e remoto quando a aplicação é fechada"
+msgstr ""
+"Guardar o último directório local e remoto quando a aplicação é fechada"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Ligar ao servidor remoto ao iniciar"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
-msgstr "Ligar-se automaticamente ao servidor remoto quando a aplicação "
-"é iniciada."
+msgstr ""
+"Ligar-se automaticamente ao servidor remoto quando a aplicação é iniciada."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rede"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Prazo tempo rede:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Expirou tempo ao aguardar por entrada/saída da rede. Esta NÃO é uma "
 "expiração por inactividade."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Tentativas ligação:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
-"O número de tentativas automáticas a efectuar. Altere para 0 para tentar indefinidamente"
+"O número de tentativas automáticas a efectuar. Altere para 0 para tentar "
+"indefinidamente"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Espera entre tentativas:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "O número de segundos a aguardar entre tentativas"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Máx KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "O máximo de KB/s que uma transferência de ficheiro pode ter. (0 para "
 "desabilitar)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Tamanho do Bloco de Transferência:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr "O tamanho do bloco que é usado enquanto transfere ficheiros. "
-"Deve ser um múltiplo de 1024."
+msgstr ""
+"O tamanho do bloco que é usado enquanto transfere ficheiros. Deve ser um "
+"múltiplo de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocolo por Omissão:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Especifica o protocolo a utilizar por omissão"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activar suporte IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -642,27 +650,27 @@ msgstr ""
 "na caixa de lista de ficheiros. 0=Ver ficheiro 1=Editar ficheiro "
 "2=Transferir ficheiro"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "A largura por omissão da caixa de lista de ficheiros locais"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "A largura por omissão da caixa de lista de ficheiros remotos"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "A altura por omissão da caixa de lista de ficheiros locais/remotos"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "A altura por omissão da caixa de lista de transferência"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "A altura por omissão da janela de registo"
 
-#: ../lib/options.h:177
+#: 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."
@@ -670,15 +678,15 @@ msgstr ""
 "A largura da coluna de nome de ficheiro na janela de transferência. Definir "
 "como 0 para que a coluna se redimensione automaticamente."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "A coluna por omissão por que ordernar"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordenar ascendente ou descendentemente"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -687,7 +695,7 @@ msgstr ""
 "Definir como 0 para que a coluna se redimensione automaticamente. Definir "
 "como -1 para desabilitar esta coluna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -696,7 +704,7 @@ msgstr ""
 "como 0 para que a coluna se redimensione automaticamente. Definir como -1 "
 "para desabilitar esta coluna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -705,7 +713,7 @@ msgstr ""
 "como 0 para que a coluna se redimensione automaticamente. Definir como -1 "
 "para desabilitar esta coluna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -714,7 +722,7 @@ msgstr ""
 "0 para que a coluna se redimensione automaticamente. Definir como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -723,7 +731,7 @@ msgstr ""
 "para que a coluna se redimensione automaticamente. Definir como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -732,254 +740,188 @@ msgstr ""
 "como 0 para que a coluna se redimensione automaticamente. Definir como -1 "
 "para desabilitar esta coluna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "A cor dos comandos que são enviados para o servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "A cor dos comandos que são recebidos do servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "A cor das mensagens de erro"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "A cor do resto das mensagens de registo"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Transferência de ficheiro acelerada para %.2f KB/s\n"
 
-#: ../lib/protocols.c:378
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Erro ao alterar LC_TIME para '%s'. Voltando para '%s'\n"
 
-#: ../lib/protocols.c:389
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "A carregar listagem de directório %s da cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:399
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "A carregar listagem de directório %s do servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:461
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Erro ao converter o texto '%s' da codificação de caracteres %s para %s: %s\n"
-
-#: ../lib/protocols.c:654
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr ""
-"Aviso: Obtendo o caminho do ficheiro '%s'. O caminho obtido (%s) "
-"não corresponde ao directório actual (%s)\n"
+"Aviso: Obtendo o caminho do ficheiro '%s'. O caminho obtido (%s) não "
+"corresponde ao directório actual (%s)\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Erro: Incapaz de escrever para cache: %s\n"
 
-#: ../lib/protocols.c:713
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Erro: Incapaz de encontrar marcador %s\n"
 
-#: ../lib/protocols.c:720
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Erro Marcadores: O marcador %s não possui um nome de servidor\n"
 
-#: ../lib/protocols.c:842 ../lib/protocols.c:869
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "De momento o protocolo '%s' não é suportado.\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 "A procurar %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 "Incapaz de encontrar nome de servidor %s: %s\n"
-
-#: ../lib/protocols.c:2091
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Uma ligação simbólica recursiva for encontrada %s\n"
 
-#: ../lib/protocols.c:2379
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Falha ao criar um socket: %s\n"
-
-#: ../lib/protocols.c:2385 ../lib/protocols.c:2491
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "A tentar %s:%d\n"
-
-#: ../lib/protocols.c:2390 ../lib/protocols.c:2498
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Incapaz de se ligar a %s: %s\n"
-
-#: ../lib/protocols.c:2428 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Falha ao criar um socket 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 ""
-"Incapaz de encontrar nome de serviço %s/tcp. Verifique o seu ficheiro de "
-"serviços\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 "Erro: Incapaz de definir fechar na marca exec: %s\n"
-
-#: ../lib/protocols.c:2521
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Ligado a %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 "Ligação a %s expirou\n"
-
-#: ../lib/protocols.c:2904
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Incapaz de obter marcas de socket: %s\n"
-
-#: ../lib/protocols.c:2918
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Incapaz de definir socket como não-bloqueante: %s\n"
-
-#: ../lib/protocols.c:3064
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Erro: Servidor %s remoto desligou-se. Atingido nº máximo tentativas...a "
 "desistir\n"
 
-#: ../lib/protocols.c:3072
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Erro: Servidor %s remoto desligou-se. Irá ligar-se novamente em %d segundos\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Erro: Incapaz de definir fechar na marca exec: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Incapaz de abrir pty mestre %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Incapaz de criar par de socket: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Erro: Incapaz de executar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Incapaz de fazer fork de outro processo: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nome servidor proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nome servidor firewall"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Porto proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Porto onde se ligar na firewall"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Utilizador proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "O seu nome na firewall"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Senha proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "A sua senha na firewall"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Utilizar HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Deseja utilizar HTTP/1.1 ou 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"
@@ -988,65 +930,65 @@ msgstr ""
 "Recebida do servidor resposta incorrecta, a desligar\n"
 "Tamanho de bloco '%s' inválido devolvido pelo servidor remoto\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 "A desligar-se do servidor %s\n"
 
-#: ../lib/rfc2068.c:304
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "A iniciar transferência de ficheiro na posição "
 
-#: ../lib/rfc2068.c:325
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Incapaz de obter ficheiro %s\n"
 
-#: ../lib/rfc2068.c:424 ../lib/sshv2.c:1301
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "A obter listagem de directório...\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 "Recebida do servidor resposta incorrecta, a desligar\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Comando SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "utilizador servidor"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "utilizador servidor:porto"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICAR"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "utilizador servidor porto"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "utilizador servidor NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Endereço email:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1054,19 +996,19 @@ msgstr ""
 "Esta é a senha que será utilizada sempre que se ligar a um servidor FTP "
 "remoto como anónimo"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Conta proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "A sua conta na firewall (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo servidor proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1083,27 +1025,27 @@ msgstr ""
 "(utilizador), p (senha), h (servidor), o (porto) ou a (conta). Por exemplo, "
 "para especificar o utilizador proxy, deverá inserir %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorar endereço PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"Se esta opção estiver activa, o campo do endereço IP PASV do servidor "
-" FTP será ignorado e o endereço IP da máquina será usado alternativamente. "
-"Isto é geralmente necessário quandos os routers fornecem o seu endereço "
-"IP interno em vez do endereço IP externo numa resposta PASV."
+"Se esta opção estiver activa, o campo do endereço IP PASV do servidor  FTP "
+"será ignorado e o endereço IP da máquina será usado alternativamente. Isto é "
+"geralmente necessário quandos os routers fornecem o seu endereço IP interno "
+"em vez do endereço IP externo numa resposta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferência ficheiros passiva"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1119,11 +1061,11 @@ msgstr ""
 "esteja inactivo, então o gFTP irá abrir um porto do lado do cliente e o "
 "servidor remoto tentará ligar-se a ele."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolver Ligações Simbólicas Remotas (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1135,15 +1077,16 @@ msgstr ""
 "altura em que quererá deactivar esta opção será quando o servidor FTP não "
 "suportar a opção -L para LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferir ficheiros em modo ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1153,271 +1096,324 @@ msgstr ""
 "seguro deixar desligado. Caso esteja a transferir dados binários, deverá "
 "deixar esta opção desabilitada."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1449
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Resposta inválida '%c' recebida do servidor.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Falha ao criar um socket 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 "Incapaz de encontrar um endereço IP na resposta PASV '%s'\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 "A ignorar endereço IP na resposta PASV, ligando a %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 "Incapaz de criar uma ligação de dados: %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 "Incapaz de obter nome de socket: %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 "Incapaz de anexar porto: %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 "Incapaz de escutar no porto %d: %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Falha ao criar um socket 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 "Erro: Não parece que a ligação seja via IPv6. A abortar ligação.\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 "Resposta EPSV inválida '%s'\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Incapaz de obter endereço de socket local: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Incapaz de aceitar ligação do servidor: %s\n"
 
-#: ../lib/rfc959.c:1619
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1621
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Aviso: Incapaz de parsear listagem %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "A procurar %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 "Incapaz de encontrar nome de servidor %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Falha ao criar um socket: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "A tentar %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 "Incapaz de se ligar a %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Ligado a %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 ""
+"Incapaz de encontrar nome de serviço %s/tcp. Verifique o seu ficheiro de "
+"serviços\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Ligação a %s expirou\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Incapaz de obter marcas de socket: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Incapaz de definir socket como não-bloqueante: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nome Apl SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "O caminho para o executável SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parâmetros Extra SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parâmetros extra a passar para a aplicação SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Necessita utilizador/Senha SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Necessita de um utilizador/senha para ligações SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "A executar aplicação %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Introduza a frase secreta para a chave RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Introduza a frase secreta para a chave '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Senha"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "senha"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(sim/não)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Introduza o Código Secreto:"
 
-#: ../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:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduza Senha"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduza Senha SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Erro: Foi inserida uma senha incorrecta\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialização Protocolo\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versão protocolo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Abrir %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Fechar\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Abrir Directório %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Ler Directório\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Remover ficheiro %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Criar directório %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Remover directório %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Caminho real %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributos ficheiro\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Estado %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ficheiro ou directório inexistente"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Falha"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mensagen inválida"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Sem ligação"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Ligação perdida"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operação não suportada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Servidor devolveu mensagem desconhecida"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Erro: Tamanho mensagem %d demasiado grande\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 "Erro: Tamanho mensagem %d de servidor demasiado grande\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1425,41 +1421,41 @@ msgstr ""
 "Ocorreu um erro ao inicializar uma ligação SSH com o servidor remoto. A "
 "mensagem de erro do servidor remoto foi a seguinte:\n"
 
-#: ../lib/sshv2.c:1134
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "A abrir ligação SSH para %s\n"
 
-#: ../lib/sshv2.c:1186
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Inicio de sessão com sucesso no servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Ficheiro de Entropia SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Ficheiro entropia SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Tamanho Semente de Entropia:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "O número máximo de bytes da semente do motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificar SSL do par"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1472,11 +1468,11 @@ msgstr ""
 "Assunto = %s\n"
 "Erro %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Incapaz de obter certificado da outra parte\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 "
@@ -1485,56 +1481,45 @@ msgstr ""
 "ERRO: O servidor no certificado SSL (%s) não coincide com o servidor a que "
 "se estabeleceu ligação (%s). A abortar ligação.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Incapaz de inicializar a biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Erro ao ler certificados SSL por omissão\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Erro ao definir lista de cifras (nenhuma cifra válida)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Erro: motor SSL não foi inicializado\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Erro ao configurar ligação SSL (objecto BIO)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Erro ao configurar ligação SSL (objecto SSL)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Erro com certificado da outra parte: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operação cancelada\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "A aguardar %d segundos até tentar novamente ligação\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 ""
-">. Caso tenha quaisquer questões, comentários ou sugestões sobre esta "
-"aplicação, envie-as para mim por email (em inglês). Pode sempre saber as "
-"últimas notícias sobre o gFTP através da minha página em http://www.gftp.";
-"org/\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 "
@@ -1544,73 +1529,75 @@ msgstr ""
 "COPYING. Esta é uma aplicação livre, e pode redistribui-la sob determinadas "
 "condições; para detalhes, consulte o ficheiro COPYING\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
-msgstr "Traduzido por Filipe Gomes <filipefgomes gmail com> e Duarte Loreto <happyguy_pt hotmail com>"
+msgstr ""
+"Traduzido por Filipe Gomes <filipefgomes gmail com> e Duarte Loreto "
+"<happyguy_pt hotmail 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 "Erro: Desligado de qualquer servidor remoto\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "utilização: chmod <modo> <ficheiro>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "utilização: rename <nome antigo> <novo nome>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "utilização: delete <ficheiro>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "utilização: rmdir <directório>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "utilização: site <comando de servidor>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "utilização: mkdir <novo directório>\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 "utilização: chdir <directório>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argumento inválido\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Limpar a cache de directório\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "utilização: abrir "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "utilização: set [variável = valor]\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 "Erro: variável %s não é uma variável de configuração válida.\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 "Erro: Variável %s não está disponível no porto de texto do gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1618,328 +1605,327 @@ msgstr ""
 "Comandos suportados:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "utilização: %s <especificação ficheiros>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "sobre"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Apresenta informação gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "Define modo actual de transferência de ficheiro como Ascii (apenas FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binário"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Define modo actual de transferência de ficheiro como Binário (apenas FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Altera o directório de trabalho remoto"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Altera as permissões de um ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opções disponíveis: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desliga-se do servidor remoto"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Apaga um ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Apresenta a listagem do directório de trabalho remoto actual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Descarrega o(s) ficheiro(s) remoto(s)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Apresenta este ecrã de ajuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Altera o directório de trabalho local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Alter as permissões de um ficheiro local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Apaga o ficheiro local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Apresenta a listagem do directório de trabalho local actual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Cria um directório local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Apresenta directório local actual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renomeia um ficheiro local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Remove um directório local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Cria um directório remoto"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Envia ficheiro(s) local(is)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Abre uma ligação a um servidor remoto"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Apresenta o directório remoto actual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Sair do gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renomeia um ficheiro remoto"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Apaga um directório remoto"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Apresenta variáveis de ficheiro de configuração. Também pode definir "
 "variáveis com set var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "servidor"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Executar um comando específico de servidor"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Erro: Comando desconhecido\n"
 
-#: ../src/uicommon/gftpui.c:1334
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s transferido com sucesso a %.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 "A ignorar ficheiro %s no servidor %s\n"
 
-#: ../src/uicommon/gftpui.c:1389
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "A parar a transferência no servidor %s\n"
 
-#: ../src/uicommon/gftpui.c:1540
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Incapaz de realizar o download de %s a partir de %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 "
 "log for which items were not properly transferred."
 msgstr ""
-"Houve %d ficheiros ou directórios que não puderem ser transferidos. Verifique "
-"o registo para saber que itens não foram transferidos."
+"Houve %d ficheiros ou directórios que não puderem ser transferidos. "
+"Verifique o registo para saber que itens não foram transferidos."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Prima o botão de parar antes de fazer qualquer outra coisa\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Executar Marcador"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Adicionar Marcador: Tem de inserir um nome para o marcador\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Adicionar Marcador: Incapaz de adicionar marcador %s pois esse nome já "
 "existe\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Adicionar Marcador"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Adicionar Marcador: Tem de inserir um servidor\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1949,31 +1935,31 @@ msgstr ""
 "Pode separar itens com uma / para os colocar num\n"
 "submenu (ex: Servidores Linux/Slackware)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Recordar senha"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Tem de especificar um nome para o marcador."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduza o nome da nova pasta a criar"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Novo Item"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduza o nome do novo item a criar"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1982,106 +1968,99 @@ msgstr ""
 "Tem a certeza que deseja apagar o marcador\n"
 "%s e todos os seus filhos?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Apagar Marcador"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editar Entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Servidor:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Directório Remoto:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Directório Local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Iniciar sessão como ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancelar  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Ficheiro/destacar"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Ficheiro/Nova _Pasta..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Ficheiro/Novo _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Ficheiro/_Apagar"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Ficheiro/_Propriedades..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Ficheiro/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Ficheiro/_Fechar"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editar Marcadores"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2089,91 +2068,90 @@ msgstr ""
 "Pode agora ajustar os atributos dos seus ficheiros\n"
 "Nota: Nem todos os servidores ftp suportam esta funcionalidade"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Colado"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Utilizador"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Ler"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escrever"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Executar"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Outro"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Tem a certeza que deseja apagar estes %ld ficheiros e %ld directórios"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Tem a certeza que deseja apagar estes %ld ficheiros"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Tem a certeza que deseja apagar estes %ld directórios"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Apagar Ficheiros/Directórios"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Ligar"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Recebido URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrastar-E-Largar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Sair"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2181,468 +2159,455 @@ msgstr ""
 "Existem transferências de ficheiros em decurso.\n"
 "Tem a certeza que deseja sair?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Abrir Localização"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduza um URL a que se ligar"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/destacar"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Janela _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Janela _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binário"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Ficheiro/_Propriedades..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Sair"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/destacar"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/Abrir _Localização..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/_Desligar"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Alterar Especificação _Fich..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Mostrar seleccionados"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Seleccionar _Tudo"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Seleccionar Todos Ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Desseleccionar Tudo"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Gravar Listagem Directório..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Enviar Comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/A_lterar Directório"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissões..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Ficheiro/_Nova Pasta..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/_Renomear..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/A_pagar..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/Act_ualizar"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remoto"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remoto/destacar"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remoto/Abrir _Localização..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remoto/Desl_igar"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remoto/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remoto/Alterar Especificação _Fich..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remoto/_Mostrar seleccionados"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remoto/Seleccionar _Tudo"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remoto/Seleccionar Todos Ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remoto/Desseleccionar Tudo"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remoto/Gravar Listagem Directório..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remoto/Enviar Comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remoto/_Alterar Directório"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remoto/_Permissões..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Ficheiro/_Nova Pasta..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remoto/_Renomear..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remoto/Apa_gar..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remoto/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remoto/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remoto/Actuali_zar"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Marcadores"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Marcadores/destacar"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Marcadores/Adicionar _Marcador"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Marcadores/Editar Marcadores"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Marcadores/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferências"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferências/destacar"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferências/_Iniciar"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferências/_Parar"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferências/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferências/Ignorar _Ficheiro Actual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferências/_Remover Ficheiro"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferências/Mover Ficheiro _Acima"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferências/Mover Ficheiro A_baixo"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferências/_Obter Ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferências/_Colocar Ficheiros"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/Re_gisto"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Registo/destacar"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Registo/_Limpar"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Local/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Registo/_Gravar registo..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Ferramenta_s"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Ferramentas/destacar"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Ferramentas/C_omparar Janelas"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Ferramentas/Limpar _Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Ajuda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ajuda/destacar"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre..."
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Servidor: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Servidor: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Utilizador: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Utilizador: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Senha: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comando: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nome ficheiro"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributos"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Erro: Tem de inserir um servidor a que se ligar\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduza o Utilizador"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Introduza o seu utilizador para este servidor"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:586 ../src/gtk/transfer.c:596
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Introduza a sua senha para este servidor"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operação cancelada...tem de inserir uma expressão\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Criar Directório"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduza nome do directório a criar"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Para o que deseja renomear %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Servidor"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introduza comando específico servidor"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Anteceder com SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 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 "Ignorado"
 
-#: ../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 "A Aguardar..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobrepor"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Retomar"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acção"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferir Ficheiros"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2651,62 +2616,61 @@ msgstr ""
 "remoto\n"
 "Seleccione o que deseja realizar"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Ignorar Ficheiro"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Seleccionar Tudo"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Desseleccionar Tudo"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Alterar Especificação Fich.: Operação cancelada...tem de inserir uma "
 "expressão\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Alterar Especificação Fich."
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduza uma nova especificação de ficheiro"
 
-#: ../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:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Erro: Incapaz de abrir %s para escrita: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Gravar listagem Directório"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Erro: Erro ao escrever em %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Ficheiro de registo escrito com sucesso para %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Gravar Registo"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2715,11 +2679,11 @@ msgstr ""
 "Incapaz de encontrar o ficheiro de acordo de licenciamento COPYING. "
 "Certifique-se de que se encontra em %s ou em %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Sobre gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2730,27 +2694,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Página Oficial: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acordo Licenciamento"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:405
-msgid "  Close  "
-msgstr "  Fechar  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparar Janelas"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desliga-se do servidor remoto"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2758,72 +2718,56 @@ msgstr ""
 "Ligar-se ao site especificado no campo de host. Se este campo estiver em "
 "branco, então uma caixa de diálogo será apresentada para inserir o URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Todos Ficheiros"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Em Cache) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Desligado"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Erro ao abrir ficheiro %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Desligado de qualquer servidor remoto\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Esta funcionalidade não está disponível com este protocolo\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Apenas pode ter seleccionado um item\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Tem de ter pelo menos um item seleccionado\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Alterar"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sim  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Não  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "A obter listagens de directórios"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Parar  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2832,109 +2776,89 @@ msgstr ""
 "Recebidos %ld directórios\n"
 "e %ld ficheiros"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Erro gFTP: Incapaz de encontrar ficheiro %s em %s ou %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editar Servidor"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Adicionar Servidor"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Endereço Rede"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Endereço de rede:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Máscara Rede"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Máscara R_ede:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domínio:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Máscara Rede"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Servidores Locais"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opções"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "A receber nomes de ficheiros..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:712
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "A Ligar..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Obter Ficheiros: Não está ligado a nenhum servidor remoto\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Erro: Filho %d devolveu %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Filho %d devolveu sucesso\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Erro: Filho %d não terminou correctamente\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Erro: Incapaz de obter informação sobre ficheiro %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Ficheiro %s não foi alterado\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2943,123 +2867,174 @@ msgstr ""
 "Ficheiro %s foi alterado.\n"
 "Deseja envia-lo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editar Ficheiro"
 
-#: ../src/gtk/transfer.c:499
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../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 ""
 "Enviado %s de %s a %.2fKB/s, %02d:%02d:%02d tempo remanescente estimado"
 
-#: ../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 ""
 "Recebido %s de %s a %.2fKB/s, %02d:%02d:%02d tempo remanescente estimado"
 
-#: ../src/gtk/transfer.c:773
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
-msgstr ""
-"Enviado %s de %s, transferência parou, tempo remanescente desconhecido"
+msgstr "Enviado %s de %s, transferência parou, tempo remanescente desconhecido"
 
-#: ../src/gtk/transfer.c:779
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Recebido %s de %s, transferência parou, tempo remanescente desconhecido"
 
-#: ../src/gtk/transfer.c:823
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Percentagem completada desconhecida. (Ficheiro %ld de %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%% terminado, %02d:%02d:%02d tempo remanescente estimado. (Ficheiro %ld de "
 "%ld)"
 
-#: ../src/gtk/transfer.c:865
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "A obter nomes de ficheiros...%s bytes"
 
-#: ../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ão existem transferências de ficheiros seleccionadas\n"
 
-#: ../src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Ver"
 
-#: ../src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editar"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Ver: %s é um directório. Não o pode ver.\n"
 
-#: ../src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Editar: Tem de especificar um editor no diálogo de opções\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 "Editar: %s é um directório. Não o pode editar.\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 "Editar: Tem de especificar um editor no diálogo de opções\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Ver: Incapaz de fazer fork de outro processo: %s\n"
 
-#: ../src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "A executar aplicação: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:272
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "A abrir %s com %s\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "A ver ficheiro %s\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Ver: Incapaz de abrir ficheiro %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Incapaz de abrir consola de controlo %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Utilizador [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s já existe. (%s tamanho da fonte, %s tamanho do destino):\n"
-"(s)obrepor, (c)ontinuar, (i)gnorar, (S)obrepor todos, (C)ontinuar todos, "
-"(I)gnorar todos: (%c)"
+"(s)obrepor, (c)ontinuar, (i)gnorar, (S)obrepor todos, (C)ontinuar todos, (I)"
+"gnorar todos: (%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 ""
+#~ ">. Caso tenha quaisquer questões, comentários ou sugestões sobre esta "
+#~ "aplicação, envie-as para mim por email (em inglês). Pode sempre saber as "
+#~ "últimas notícias sobre o gFTP através da minha página em http://www.gftp.";
+#~ "org/\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancelar  "
+
+#~ msgid "Host: "
+#~ msgstr "Servidor: "
+
+#~ msgid "User: "
+#~ msgstr "Utilizador: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Fechar  "
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Sim  "
+
+#~ msgid "  No  "
+#~ msgstr "  Não  "
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Network Address"
+#~ msgstr "Endereço Rede"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
 
 #~ msgid "Startup Directory:"
 #~ msgstr "Directório Inicial:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 722b839..ac4de54 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,89 +12,97 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-21 13:37-0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2008-05-19 01:59-0300\n"
 "Last-Translator: Henrique P Machado <zehrique gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br listas cipsga org br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s inválida\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Erro: Linha %s inválida no arquivo de índice de cache\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Erro: Não foi possível criar diretório %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Erro: Não foi possível criar arquivo temporário: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Erro ao fechar descritor de arquivo: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Erro: Não foi possível procurar no arquivo %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Erro ao converter o texto \"%s\" do conjunto de caracteres %s para %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Erro: Não foi possível abrir arquivo local %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sslcommon.c:496
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Erro: Não foi possível escrever no socket: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sshv2.c:445 ../lib/sslcommon.c:449
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Erro: Não foi possível ler do socket: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Erro do gFTP: Nome de arquivo de marcadores inválido %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Aviso: Não foi possível encontrar arquivo de marcadores principal %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Erro do gFTP: Não foi possível abrir arquivo de marcadores %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Aviso do gFTP: Ignorando linha %d no arquivo de marcadores: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Aviso do gFTP: Linha %d não possui argumentos suficientes\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -104,7 +112,7 @@ msgstr ""
 "passar pelo servidor proxy (se disponível). Sintaxe: dont_use_proxy=.domínio "
 "ou dont_use_proxy=endereço/máscara-de-rede"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -113,55 +121,55 @@ msgstr ""
 "visualização. Nota: Todos os argumentos, exceto a extensão de arquivo, são "
 "opcionais"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Erro do gFTP: Nome de arquivo de configuração inválido %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Erro do gFTP: Não foi possível criar diretório %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
-"Erro do gFTP: Não foi possível encontrar arquivo de configuração principal %"
-"s\n"
+"Erro do gFTP: Não foi possível encontrar arquivo de configuração principal "
+"%s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Foi feito um \"make install\"?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Erro do gFTP: Não foi possível abrir arquivo de configuração %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Terminando devido a erros de análise na linha %d do arquivo de configuração\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Aviso do gFTP: Ignorando linha %d no arquivo de configuração: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Erro do gFTP: Nome de arquivo de log inválido %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Aviso do gFTP: Não foi possível abrir %s para escrita: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -170,7 +178,7 @@ msgstr ""
 "<masneyb gftp org>. Aviso: Quaisquer comentários adicionados a este arquivo "
 "SERÃO sobrepostos"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -182,7 +190,7 @@ msgstr ""
 "facilmente por alguem que esteja olhando enquanto você edita este arquivo. "
 "Antes disto, todas as senhas eram armazenadas em um arquivo de texto plano."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -193,92 +201,95 @@ msgstr ""
 "SERÃO sobrepostos. Se uma entrada tiver um (*) no seu comentário, você não "
 "poderá alterá-la dentro do gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<desconhecido>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "Erro FATAL do gFTP: Opção de configuração \"%s\" não encontrada na tabela "
 "global de hash\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Erro: Não foi possível enviar o arquivo %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Erro: Não foi possível escrever para o arquivo %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Erro: Erro ao fechar o arquivo: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "A lista de arquivos do servidor de FSP %s está corrompida\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340
+#: 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 "desconhecido"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Não foi possível obter lista de diretórios FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Diretório alterado com sucesso para %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Não foi possível alterar diretório para %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s removido com sucesso\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Erro: Não foi possível remover diretório %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Erro: Não foi possível remover arquivo %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Diretório %s criado com sucesso\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s renomeado para %s com sucesso\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Erro: Não foi possível renomear %s para %s: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -286,7 +297,7 @@ msgstr ""
 "Suporte a FTPS indisponível já que o suporte a SSL não foi compilado. "
 "Abortando a conexão.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -294,107 +305,105 @@ msgstr ""
 "Suporte a HTTPS indisponível já que o suporte a SSL não foi compilado. "
 "Abortandoa conexão.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Não foi possível obter diretório de trabalho atual: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Diretório local alterado com sucesso para %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Não foi possível alterar diretório local para %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Erro: Não foi possível truncar arquivo local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Não foi possível obter lista de diretório local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Modo de %s alterado com sucesso para %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Erro: Não foi possível alterar modo de %s para %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Marca de tempo alterada com sucesso para %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Erro: Não foi possível alterar marca de tempo de %s para %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistema arquivos local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "uso: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nenhum"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "arquivo"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "tamanho"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "usuário"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupo"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datahora"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributos"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendente"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendente"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Geral"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Programa de visualização:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -402,27 +411,27 @@ msgstr ""
 "O programa padrão usado para visualizar arquivos. Se estiver em branco, será "
 "usado o visualizador interno de arquivos"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programa de edição:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "O programa padrão usado para editar arquivos."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Tamanho Máx. da Janela de Log:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "O tamanho máximo da janela de log em bytes para a conversão GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Conjuntos de Caractere Remoto:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -430,11 +439,11 @@ msgstr ""
 "Esta é uma lista separada por vírgulas de conjuntos de caracteres para "
 "tentar converter a mensagem remota para o local atual"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME remoto:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -442,200 +451,204 @@ msgstr ""
 "Esse é o valor de LC_TIME para o site remoto. Esse valor serve para que "
 "datas possam ser analisadas corretamente na lista do diretório."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Número de segundos para manter entradas de cache antes que elas expirem."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Acrescentar transferências de arquivos"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Acrescenta novas transferências de arquivos às existentes"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Fazer uma transferência por vez"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Fazer apenas uma transferência por vez?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Sobrescrever por Padrão"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Sobrescreve arquivos por padrão ou define para retomar transferências de "
 "arquivos"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Preservar permissões do arquivo"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Preserva as permissões de arquivos transferidos"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Preservar horários do arquivo"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Preserva os horários de arquivos transferidos"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Atualizar após cada transferência de arquivo"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Atualiza a lista após cada transferência de arquivo"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Ordenar diretórios primeiro"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Coloca os diretórios antes dos arquivos"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Mostrar arquivos ocultos"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Mostra arquivos ocultos nas listagens"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Mostrar o status da transferência no título"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Mostra o status da transferência na barra de titulo"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Iniciar transferências de arquivos"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr ""
 "Inicia automaticamente as transferências de arquivos quando elas entram na "
 "fila"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permitir comandos manuais na interface gráfica"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Permite a entrada manual de comandos na interface gráfica (funções como a "
 "versão em texto)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Lembrar o último diretório"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 "Salva o último diretório acessado localmente e remotamente quando a "
 "aplicação for finalizada"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Conectar ao servidor remoto na inicialização"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr ""
 "Conecta-se a um servidor remoto automaticamente quando a aplicação for "
 "iniciada."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rede"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Tempo de expiração de rede:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Tempo de expiração ao aguardar por entrada/saída da rede. Esta NÃO é uma "
 "expiração por inatividade."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Tentativas de conexão:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "O número de novas tentativas a fazer automaticamente. Defina como 0 para "
 "tentar indefinidamente"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Espera entre tentativas:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "O número de segundos a aguardar entre tentativas"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Máx KB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "O máximo de KB/s que uma transferência de arquivo pode ter. (Defina como 0 "
 "para desabilitar)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Tamanho do Bloco de Transferência:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "O tamanho do bloco, que é usado ao transferir arquivos. Esse valor deve ser "
 "um múltiplo de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocolo Padrão:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Especifica o protocolo padrão a ser usado"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Habilitar suporte a IPv6"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -643,27 +656,27 @@ msgstr ""
 "Define o que vai acontecer ao dar um clique duplo sobre um arquivo na caixa "
 "de lista de arquivos. 0=Ver arquivo 1=Editar arquivo 2=Transferir arquivo"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "A largura padrão da lista de arquivos locais"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "A largura padrão da lista de arquivos remotos"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "A altura padrão da lista de arquivos locais/remotos"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "A altura padrão da lista de transferência"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "A altura padrão da janela de log"
 
-#: ../lib/options.h:177
+#: 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."
@@ -671,15 +684,15 @@ msgstr ""
 "A largura da coluna de nome de arquivo na janela de transferência. Defina "
 "como 0 para que a coluna se redimensione automaticamente."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "A coluna padrão pela qual ordernar"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ordenação ascendente ou descendente"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -688,7 +701,7 @@ msgstr ""
 "0 para que a coluna se redimensione automaticamente. Defina como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -697,7 +710,7 @@ msgstr ""
 "que a coluna se redimensione automaticamente. Defina como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -706,7 +719,7 @@ msgstr ""
 "que a coluna se redimensione automaticamente. Defina como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -715,7 +728,7 @@ msgstr ""
 "que a coluna se redimensione automaticamente. Definir como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -724,7 +737,7 @@ msgstr ""
 "coluna se redimensione automaticamente. Defina como -1 para desabilitar esta "
 "coluna"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -733,75 +746,75 @@ msgstr ""
 "que a coluna se redimensione automaticamente. Defina como -1 para "
 "desabilitar esta coluna"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "A cor dos comandos que são enviados ao servidor"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "A cor dos comandos que são recebidos do servidor"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "A cor das mensagens de erro"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "A cor do restante das mensagens de log"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "A transferência do arquivo será acelerada para %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Erro ao configurar LC_TIME como \"%s\". Retornando para \"%s\"\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Carregando lista do diretório %s do cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Carregando lista do diretório %s do servidor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -810,109 +823,110 @@ msgstr ""
 "Aviso: Obtendo o caminho do arquivo \"%s\". O caminho (%s) não se assemelha "
 "ao diretório atual (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Erro: Não foi possível escrever no cache: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Erro: Não foi possível encontrar marcador %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Erro de Marcador: O marcador %s não possui um nome de máquina\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "O protocolo \"%s\" atualmente não é suportado.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Uma ligação simbólica recursiva foi encontrada %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Erro: Servidor %s remoto desconectou. Atingido nº máximo de retentativas... "
 "desistindo\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Erro: Servidor %s remoto desconectou. Reconexão em %d segundos\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
+#: lib/protocols.c:1634 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 "Erro: Não foi possível definir a opção fechar ao executar: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Não foi possível abrir pty mestre %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Não foi possível criar par de sockets: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Erro: Não foi possível executar ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Não foi possível bifurcar (criar fork) outro processo: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nome de máquina proxy:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nome de máquina firewall"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Porta do proxy:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Porta para conectar no firewall"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Usuário do proxy:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "O seu nome de usuário no firewall"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Senha do proxy:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "A sua senha no firewall"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Usar HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Deseja usar HTTP/1.1 ou HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -921,65 +935,65 @@ msgstr ""
 "Recebida resposta incorreta do servidor, desconectando\n"
 "Tamanho do pedaço inválido \"%s\" devolvido pelo servidor remoto\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Desconectando do servidor %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Iniciando a transferência do arquivo na posição "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Não foi possível obter arquivo %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Obtendo lista de diretório...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Resposta incorreta recebida do servidor, desconectando\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Comando SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "usuario maquina"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "usuario maquina:porta"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTICAR"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "usuario maquina porta"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "usuario maquina NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Endereço de e-mail:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -987,19 +1001,19 @@ msgstr ""
 "Esta é a senha que será usada sempre que você iniciar uma sessão num "
 "servidor FTP remoto como anônimo"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Conta proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "A sua conta no firewall (opcional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tipo de servidor proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1016,11 +1030,11 @@ msgstr ""
 "(usuário), p (senha), h (servidor), o (porta) ou a (conta). Por exemplo, "
 "para especificar o usuário do proxy, deve ser inserido %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorar endereço PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1032,11 +1046,11 @@ msgstr ""
 "lugar. Isso é geralmente necessário quando os roteadores fornecem seu IP "
 "interno ao invés do seu endereço IP externo na resposta PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferências de arquivo passivas"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1052,11 +1066,11 @@ msgstr ""
 "Caso esteja desabilitado, o gFTP irá abrir uma porta do lado do cliente e o "
 "servidor remoto tentará conectar-se a ela."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolver Ligações Simbólicas Remotas (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1068,15 +1082,16 @@ msgstr ""
 "situação em que se deve desabilitar esta opção é quando o servidor FTP "
 "remoto não suportar a opção -L para LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferir arquivos em modo ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1086,284 +1101,327 @@ msgstr ""
 "seguro deixar desligado. Caso esteja transferindo dados binários, deve-se "
 "deixar esta opção desabilitada."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Resposta \"%c\" inválida recebida do servidor.\n"
 
-#: ../lib/rfc959.c:706
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Falha ao criar socket IPv4: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Não foi possível encontrar um endereço IP na resposta PASV \"%s\"\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "Não foi possível encontrar um endereço IP na resposta PASV, na tentativa de "
 "conectar a %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Não foi possível criar uma conexão de dados: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Não foi possível obter nome de socket: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Não foi possível vincular uma porta: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Não foi possível escutar na porta %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Falha ao criar um socket IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Erro: Não parece que nós estamos conectados via IPv6. Abortando conexão.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Resposta do EPSV invalida \"%s\"\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Não foi possível obter endereço do socket local: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Não foi possível aceitar conexão do servidor: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Aviso: Não foi possível analisar lista %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Procurando %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 "Não foi possível encontrar nome de máquina %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Falha ao criar um socket: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Tentando %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 "Não foi possível conectar a %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Conectado a %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 ""
+"Não foi possível encontrar nome de serviço %s/tcp. Verifique o seu arquivo "
+"de serviços\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Conexão a %s expirou\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Não foi possível obter opções do socket: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Não foi possível definir socket como não-bloqueante: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nome do Prog. SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "O caminho para o executável SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parâmetros Extras SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parâmetros extra a passar para o programa SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Necessita Usuário/Senha SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Requer um usuário/senha para conexões SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Executando programa %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Digite a frase secreta para a chave RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Digite a frase secreta para a chave '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Senha"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "senha"
 
-#: ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Conexão a %s expirou\n"
-
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(sim/não)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Digite o CÓDIGO SECRETO:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Digite a Senha"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Digite a Senha SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Erro: Foi digitada uma senha incorreta\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Inicialização de Protocolo\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versão do protocolo %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Abrir %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Fechar\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Abrir Diretório %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Ler Diretório\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Remover arquivo %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Criar diretório %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Remover diretório %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Caminho real %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributos de arquivo\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Estado %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Arquivo ou diretório inexistente"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Falha"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mensagen inválida"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Sem conexão"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Conexão perdida"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operação não suportada"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Mensagem desconhecida retornada do servidor"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Erro: Tamanho da mensagem %d grande demais\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Erro: Tamanho da mensagem %d de servidor grande demais\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1371,48 +1429,41 @@ msgstr ""
 "Havia uma mensagem de erro ao iniciar uma conexão SSH com o servidor remoto. "
 "A mensagem de erro do servidor a seguir:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Abrindo conexão SSH para %s\n"
 
-#: ../lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-"Não foi possível encontrar nome de serviço %s/tcp. Verifique o seu arquivo "
-"de serviços\n"
-
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Identificado com sucesso no servidor SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motor SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Arquivo Entrópico SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "arquivo entrópico SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Comprimento da semente entrópica:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "O número máximo de bytes com o qual semear o motor SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verificar o host SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1425,11 +1476,11 @@ msgstr ""
 "Assunto = %s\n"
 "Erro %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Não foi possível obter o certificado do host\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 "
@@ -1438,56 +1489,45 @@ msgstr ""
 "ERRO: O host no certificado SSL (%s) não combina com o host em que nós "
 "conectamos (%s). Abortando conexão.\n"
 
-#: ../lib/sslcommon.c:305
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Não foi possível inicializar a biblioteca OpenSSL\n"
 
-#: ../lib/sslcommon.c:320
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Erro ao abrir certificados SSL padrão\n"
 
-#: ../lib/sslcommon.c:332
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Erro ao ajustar lista de cifras (nenhuma cifra válida)\n"
 
-#: ../lib/sslcommon.c:352 ../lib/sslcommon.c:426 ../lib/sslcommon.c:474
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Erro: o motor SSL não foi iniciado\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Erro ao ajustar conexão SSL (objeto BIO)\n"
 
-#: ../lib/sslcommon.c:379
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Erro ao ajustar conexão SSL (objeto SSL)\n"
 
-#: ../lib/sslcommon.c:400
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Erro com o certificado do host: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operação cancelada\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Aguardando %d segundos até tentar novamente a conexão\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 ""
-">. Caso tenha quaisquer questões, comentários ou sugestões sobre este "
-"programa, sinta-se à vontade para enviá-las para mim por email (em inglês). "
-"Você pode sempre descobrir as últimas notícias sobre o gFTP através do meu "
-"site em http://www.gftp.org/\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 "
@@ -1497,7 +1537,7 @@ msgstr ""
 "COPYING. Este é um software livre, e você pode redistribuí-lo sob "
 "determinadas condições; para mais detalhes, consulte o arquivo COPYING\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Traduzido por\n"
@@ -1506,70 +1546,70 @@ msgstr ""
 "baseado na versão em Português Ibérico por\n"
 "Duarte Loreto <happyguy_pt hotmail 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 "Erro: Não conectado a um servidor remoto\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "uso: chmod <modo> <arquivo>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "uso: rename <nome antigo> <novo nome>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "uso: delete <arquivo>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "uso: rmdir <diretório>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "uso: site <comando do site>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "uso: mkdir <novo diretório>\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 "uso: chdir <diretório>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argumento inválido\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Limpar o cache de diretório\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "uso: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "uso: set [variável = valor]\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 "Erro: A variável %s não é uma variável de configuração válida.\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 ""
 "Erro: A variável %s não está disponível na versão de modo texto do gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1577,289 +1617,289 @@ msgstr ""
 "Comandos suportados:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "uso: %s <especificação_do_arquivo>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "sobre"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Mostra informações sobre o gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr ""
 "Define o modo de transferência do arquivo atual como ASCII (apenas para FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binário"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr ""
 "Define modo de transferência do arquivo atual como Binário (apenas para FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Altera o diretório de trabalho remoto"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Altera as permissões de um arquivo remoto"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opções disponíveis: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Desconecta do servidor remoto"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Remove um arquivo remoto"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Apresenta a lista do diretório para o diretório remoto atual"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Baixa o(s) arquivo(s) remoto(s)"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Apresenta esta tela de ajuda"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Altera o diretório de trabalho local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Altera as permissões de um arquivo local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Remove um arquivo local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Apresenta a lista do diretório para o diretório local atual"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Cria um diretório local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Mostra diretório local atual"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Renomeia um arquivo local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Remove um diretório local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Cria um diretório remoto"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Envia arquivo(s) local(is)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Abre uma conexão com um servidor remoto"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Mostra o diretório remoto atual"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Sai do gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "renomear"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Renomeia um arquivo remoto"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Remove um diretório remoto"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Mostra variáveis do arquivo de configuração. Você também pode definir "
 "variáveis com set var=val"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Executa um comando específico de um site"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Erro: Comando não reconhecido\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s transferido com sucesso a %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Ignorando arquivo %s na máquina %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Parando a transferência na máquina %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Não foi possível baixar %s de %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1869,37 +1909,36 @@ msgstr ""
 "Verifique o arquivo de log para cada item que não foi transferido "
 "apropriadamente."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Por favor pressione o botão parar antes de fazer qualquer coisa\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Executar Marcador"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Adicionar Marcador: Você deve digitar um nome para o marcador\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Adicionar Marcador: Não foi possível adicionar marcador %s pois esse nome já "
 "existe\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Adicionar Marcador"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Adicionar Marcador: Você deve digitar um nome de máquina\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1909,31 +1948,31 @@ msgstr ""
 "Pode-se separar os itens com uma / para colocá-lo\n"
 "em um submenu (ex: Sites de Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Você deve informar um nome para o marcador."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Digite o nome da nova pasta a ser criada"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Novo Item"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Digite o nome do novo item a ser criado"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1942,106 +1981,99 @@ msgstr ""
 "Tem a certeza que deseja apagar o marcador\n"
 "%s e todos os seus filhos?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Excluir Marcador"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editar Entrada"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nome de Máquina:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Diretório Remoto:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Diretório Local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Usuário:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Iniciar sessão como ANÔNIMO"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Cancelar  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Arquivo/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Arquivo/Nova _Pasta..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Arquivo/Novo _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Arquivo/E_xcluir"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Arquivo/P_ropriedades..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Arquivo/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Arquivo/_Fechar"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editar Marcadores"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2049,91 +2081,90 @@ msgstr ""
 "Você pode agora ajustar os atributos do(s) seu(s) arquivo(s)\n"
 "Nota: Nem todos os servidores ftp suportam o recurso chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Aderente"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Usuário"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Ler"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Escrever"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Executar"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Outro"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Tem certeza que deseja excluir estes %ld arquivos e %ld diretórios"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Tem certeza que deseja excluir estes %ld arquivos"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Tem certeza que deseja excluir estes %ld diretórios"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Excluir Arquivos/Diretórios"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Recebida URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Arrastar-E-Soltar"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Sair"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2141,468 +2172,455 @@ msgstr ""
 "Existem transferências de arquivos em progresso.\n"
 "Tem certeza que deseja sair?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Abrir localização"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Digite a URL à qual se conectar"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Janela _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Janela _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_ASCII"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binário"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/Pr_eferências..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Sair"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/Abrir _URL..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/_Desconectar"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Alterar Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Mostrar selecionados"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Selecionar _Tudo"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Selecionar Todos Arquivos"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Desmarcar Seleção"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Salvar Lista do Diretório..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Enviar Comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/Alterar D_iretório"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/Permissões..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/N_ova Pasta..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Re_nomear..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/E_xcluir..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Atualizar"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Remoto"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remoto/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remoto/Abrir _URL..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remoto/_Desconectar"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Remoto/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remoto/Alterar Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remoto/_Mostrar selecionados"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remoto/Selecionar _Tudo"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Remoto/Selecionar Todos Arquivos"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Remoto/Desmarcar Seleção"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Remoto/Gravar Lista do Diretório..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Remoto/Enviar Comando SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remoto/Alterar D_iretório"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remoto/Permissões..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remoto/N_ova Pasta..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remoto/Re_nomear..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remoto/E_xcluir..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remoto/_Editar..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remoto/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remoto/_Atualizar"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Marcadores"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Marcadores/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Marcadores/_Adicionar marcador"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Marcadores/_Editar marcadores"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Marcadores/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transferências"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transferências/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transferências/_Iniciar"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transferências/_Parar"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transferências/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transferências/_Ignorar Arquivo Atual"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transferências/_Remover Arquivo"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transferências/Mover Arquivo A_cima"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transferências/Mover Arquivo A_baixo"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transferências/_Obter Arquivos"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transferências/_Colocar Arquivos"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Limpar"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_Ver..."
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Salvar log..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Ferramentas"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Ferramentas/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Ferramentas/_Comparar Janelas"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Ferramentas/_Limpar Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Aj_uda"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ajuda/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Máquina: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Máquina: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Usuário: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Usuário: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Senha: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comando: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributos"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Erro: Você deve digitar uma máquina para se conectar\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Digite o Usuário"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Digite seu usuário para este servidor"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Digite a sua senha para este servidor"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operação cancelada... você precisa digitar uma expressão\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Criar Diretório"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Digite o nome do diretório a ser criado"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Para que nome deseja renomear %s?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Servidor"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Digite um comando específico do servidor"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Anteceder com SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Ignorado"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Aguardando..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Retomar"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Ação"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transferir Arquivos"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2611,60 +2629,60 @@ msgstr ""
 "remoto\n"
 "Selecione o que você quer fazer"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Ignorar Arquivo"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Desmarcar Seleção"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Alterar Filespec: Operação cancelada... deve ser digitada uma expressão\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Alterar Filespec"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Digite uma nova especificação de arquivo"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Erro: Não foi possível abrir %s para escrita: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Salvar Lista do Diretório"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Erro: Erro ao escrever em %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Arquivo de log escrito com sucesso em %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Salvar Log"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2673,14 +2691,14 @@ msgstr ""
 "Não foi possível encontrar o arquivo de acordo de licenciamento COPYING. "
 "Certifique-se de que ele se encontra em %s ou em %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Sobre o gFTP"
 
 # Removi a linha abaixo, oriunda da tradução anterior:
 # Logotipo por: Aaron Worley <planet_hoth yahoo com>\n
 # Henrique P Machado
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2691,27 +2709,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Página Oficial: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Acordo de Licenciamento"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Fechar  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Comparar Janelas"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Desconectar do servidor remoto"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2720,72 +2734,56 @@ msgstr ""
 "em branco, então uma caixa de diálogo lhe será apresentada para você "
 "informar uma URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Em Cache) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Erro ao abrir o arquivo %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Não conectado a um servidor remoto\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Este recurso não está disponível usando este protocolo\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Apenas um item pode ser selecionado\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Você deve ter pelo menos um item selecionado\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Alterar"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Sim  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Não  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Obtendo listas do diretórios"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Parar  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2794,109 +2792,89 @@ msgstr ""
 "Recebidos %ld diretórios\n"
 "e %ld arquivos"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Erro do gFTP: Não foi possível encontrar arquivo %s em %s ou %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editar Máquina"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Adicionar Máquina"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Endereço de Rede"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Endereço de rede:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Máscara de Rede"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Má_scara de rede:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "Do_mínio:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Máscara de Rede"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Máquinas Locais"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opções"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Recebendo nomes de arquivos..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Obter Arquivos: Não conectado a nenhum servidor remoto\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Erro: O filho %d retornou %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "O filho %d retornou com sucesso\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Erro: O filho %d não terminou corretamente\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Erro: Não foi possível obter informações sobre o arquivo %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "O arquivo %s não foi alterado\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2905,151 +2883,169 @@ msgstr ""
 "O arquivo %s foi alterado.\n"
 "Deseja enviá-lo?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editar Arquivo"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Concluído"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recebidos %s de %s a %.2fKB/s, tempo restante estimado: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Recebidos %s de %s a %.2fKB/s, tempo restante estimado: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recebidos %s de %s, transferência parada, tempo restante desconhecido"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recebidos %s de %s, transferência parada, tempo restante desconhecido"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Porcentagem completada desconhecida. (%ld arquivos de %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 "%d%% completo, %02d:%02d:%02d tempo restante estimado. (Arquivo %ld de %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Obtendo nomes de arquivos... %s bytes"
 
-#: ../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
+#: 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ão existem transferências de arquivos selecionadas\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visualizar"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editar"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Visualizar: %s é um diretório. Não foi possível visualizá-lo.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Editar: %s é um diretório. Não foi possível editá-lo.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr ""
 "Editar: Você deve especificar um editor na caixa de diálogo de opções\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 "Visualizar: Não foi possível bifurcar (criar fork) outro processo: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Executando programa: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Abrindo %s com %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Visualizando arquivo %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Visualizar: Não foi possível abrir o arquivo %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Não foi possível abrir o terminal de controle %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Usuário [anônimo]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s já existe. (Tamanho da fonte de %s, tamanho do destinatário de %s):\n"
 "(s)obrescrever, (r)einiciar, (i)gnorar, (S)obrescrever Todos, (R)einiciar "
 "Todos, (I)gnorar Todos: (%c)"
 
 #~ msgid ""
-#~ "Error converting string '%s' from character set %s to character set %s: %"
-#~ "s\n"
+#~ ">. 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 ""
-#~ "Erro ao converter o texto \"%s\" do conjunto de caracteres %s para %s: %"
-#~ "s\n"
+#~ ">. Caso tenha quaisquer questões, comentários ou sugestões sobre este "
+#~ "programa, sinta-se à vontade para enviá-las para mim por email (em "
+#~ "inglês). Você pode sempre descobrir as últimas notícias sobre o gFTP "
+#~ "através do meu site em http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Cancelar  "
+
+#~ msgid "Host: "
+#~ msgstr "Máquina: "
+
+#~ msgid "User: "
+#~ msgstr "Usuário: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Fechar  "
 
-#~ msgid "Looking up %s\n"
-#~ msgstr "Procurando %s\n"
+#~ msgid "Add"
+#~ msgstr "Adicionar"
 
-#~ msgid "Cannot look up hostname %s: %s\n"
-#~ msgstr "Não foi possível encontrar nome de máquina %s: %s\n"
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
 
-#~ msgid "Failed to create a socket: %s\n"
-#~ msgstr "Falha ao criar um socket: %s\n"
+#~ msgid "  Yes  "
+#~ msgstr "  Sim  "
 
-#~ msgid "Trying %s:%d\n"
-#~ msgstr "Tentando %s:%d\n"
+#~ msgid "  No  "
+#~ msgstr "  Não  "
 
-#~ msgid "Cannot connect to %s: %s\n"
-#~ msgstr "Não foi possível conectar a %s: %s\n"
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
 
-#~ msgid "Connected to %s:%d\n"
-#~ msgstr "Conectado a %s:%d\n"
+#~ msgid "Network Address"
+#~ msgstr "Endereço de Rede"
 
-#~ msgid "Cannot get socket flags: %s\n"
-#~ msgstr "Não foi possível obter opções do socket: %s\n"
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
 
-#~ msgid "Cannot set socket to non-blocking: %s\n"
-#~ msgstr "Não foi possível definir socket como não-bloqueante: %s\n"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
 
 #~ msgid "\n"
 #~ msgstr "\n"
diff --git a/po/ro.po b/po/ro.po
index 33289f5..c300295 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,880 +6,921 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-10-28 09:22+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-12-05 14:10+0200\n"
 "Last-Translator: Adi Roiban <adi roiban ro>\n"
 "Language-Team: Română <gnomero lists sourceforge net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL invalid %s\n"
 
-#: ../lib/cache.c:50
-#: ../lib/cache.c:64
-#: ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Eroare: Linie invalidă %s în fișierul index din cache\n"
 
-#: ../lib/cache.c:138
-#: ../lib/fsp.c:535
-#: ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Eroare: Nu am putut crea directorul %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Eroare: Nu am crea fișierul temporar: %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:272
-#: ../lib/rfc2068.c:260
-#: ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Eroare la închiderea descriptorului de fișier: %s\n"
 
-#: ../lib/cache.c:254
-#: ../lib/fsp.c:127
-#: ../lib/fsp.c:207
-#: ../lib/local.c:184
-#: ../lib/local.c:193
-#: ../lib/local.c:247
+#: 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 "Eroare: Nu am putut căuta în fișierul %s: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "Eroare la conversia stringului „%s” din setul de caractere %s în setul de caractere %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Eroare la conversia stringului „%s” din setul de caractere %s în setul de "
+"caractere %s: %s\n"
 
-#: ../lib/config_file.c:126
-#: ../lib/config_file.c:133
-#: ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Eroare: Nu am putut deschide fișierul local %s: %s\n"
 
-#: ../lib/config_file.c:143
-#: ../lib/sockutils.c:293
-#: ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Eroare: Nu am putut scrie către socket: %s\n"
 
-#: ../lib/config_file.c:151
-#: ../lib/sockutils.c:214
-#: ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Eroare: Nu am putut citi din socket: %s\n"
 
-#: ../lib/config_file.c:183
-#: ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Eroare gFTP: Nume greșit pentru fișierul cu favorite %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Avertisment: Nu am putut găsi fișierul principal cu favorite %s\n"
 
-#: ../lib/config_file.c:203
-#: ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Eroare gFTP: Nu am putut deschide fișierul cu favorite %s: %s\n"
 
-#: ../lib/config_file.c:295
-#: ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Avertisment gFTP: Ignor linia %d din fișierul favoritelor: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Avertisment gFTP: Linia %d nu are destule argumente\n"
 
-#: ../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 "Această secțiune specifică ce gazde sunt pe subrețeaua locală și nu vor avea nevoie să iasă prin 
serverul proxy (dacă e disponibil). Sintaxa: dont_use_proxy=.domeniu sau dont_use_proxy=număr rețea/mască 
rețea"
+#: 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 ""
+"Această secțiune specifică ce gazde sunt pe subrețeaua locală și nu vor avea "
+"nevoie să iasă prin serverul proxy (dacă e disponibil). Sintaxa: "
+"dont_use_proxy=.domeniu sau dont_use_proxy=număr rețea/mască rețea"
 
-#: ../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 "ext=extensie fișier:fișier XPM:Ascii sau Binar (A sau B):program vizualizare. Toate argumentele în 
afara extensiei fișierului sunt opționale."
+#: 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 ""
+"ext=extensie fișier:fișier XPM:Ascii sau Binar (A sau B):program "
+"vizualizare. Toate argumentele în afara extensiei fișierului sunt opționale."
 
-#: ../lib/config_file.c:587
-#: ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Eroare gFTP: Nume greșit pentru fișierul de configurare %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Eroare gFTP: Nu am putut crea directorul %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "Eroare gFTP: Nu am putut găsi fișierul de configurare principal %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ați făcut un make install ?\n"
 
-#: ../lib/config_file.c:619
-#: ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Eroare gFTP: Nu am putut deschide fișierul de configurare %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
-msgstr "Execuție terminată datorită erorilor din fișierul de configurare de la linia %d\n"
+msgstr ""
+"Execuție terminată datorită erorilor din fișierul de configurare de la linia "
+"%d\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Avertisment gFTP: Ignor linia %d din fișierul de configurare: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Eroare gFTP: Nume greșit pentru fișierul log %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Avertisment gFTP: Nu am putut deschide %s pentru scriere: %s\n"
 
-#: ../lib/config_file.c:732
-#| msgid ""
-#| "Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney "
-#| "<masneyb gftp org>. Warning: Any comments that you add to this file WILL "
-#| "be overwritten"
-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 "Fișier pentru favorite gFTP. Drepturi de autor (C) 1998-2007 Brian Masney <masneyb gftp org>. 
Avertisment: orice comentarii adăugate acestui fișier VOR FI suprascrise"
-
-#: ../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 someone standing over your shoulder while you're editing 
this file. Prior to this, all passwords were stored in plaintext."
-msgstr "Notă: Parolele conținute în acest fișier sunt criptate. Acest algoritm nu este sigur. Acest lucru se 
face doar pentru a împiedica vederea sa accidentală de către altcineva în timp ce editați fișierul. Înainte 
de aceasta, toate parolele erau stocate în clar."
-
-#: ../lib/config_file.c:845
-#| msgid ""
-#| "Config file for gFTP. Copyright (C) 1998-2003 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"
-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 "Fișier de configurare pentru gFTP. Drepturi de autor (C) 1998-2007 Brian Masney <masneyb gftp org>. 
Orice comentarii adăugate la acest fișier VOR FI SUPRASCRISE. Dacă o intrare are un (*) în comentariul său, 
nu o puteți schimba din interiorul gFTP"
-
-#: ../lib/config_file.c:1209
-#: ../lib/protocols.c:385
-#: ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: 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 ""
+"Fișier pentru favorite gFTP. Drepturi de autor (C) 1998-2007 Brian Masney "
+"<masneyb gftp org>. Avertisment: orice comentarii adăugate acestui fișier "
+"VOR FI suprascrise"
+
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+"Notă: Parolele conținute în acest fișier sunt criptate. Acest algoritm nu "
+"este sigur. Acest lucru se face doar pentru a împiedica vederea sa "
+"accidentală de către altcineva în timp ce editați fișierul. Înainte de "
+"aceasta, toate parolele erau stocate în clar."
+
+#: 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 ""
+"Fișier de configurare pentru gFTP. Drepturi de autor (C) 1998-2007 Brian "
+"Masney <masneyb gftp org>. Orice comentarii adăugate la acest fișier VOR FI "
+"SUPRASCRISE. Dacă o intrare are un (*) în comentariul său, nu o puteți "
+"schimba din interiorul gFTP"
+
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<necunoscut>"
 
-#: ../lib/config_file.c:1289
-#: ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394
-#: ../lib/config_file.c:1427
+#: 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 "Eroare FATALĂ gFTP: Opțiunea de configurare „%s” nu a fost găsită în tabelul hash global\n"
+msgstr ""
+"Eroare FATALĂ gFTP: Opțiunea de configurare „%s” nu a fost găsită în tabelul "
+"hash global\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Eroare: Nu am putut încărca fișierul %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Eroare: Nu am putut scrie în fișierul %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Eroare: Eroare la închiderea fișierului: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Listă de fișiere coruptă de la serverul FSP %s\n"
 
-#: ../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
+#: 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 "necunoscut"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nu am putut obține lista de directoare FSP %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Am schimbat cu succes directorul la %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Nu am putut schimba directorul la %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Am șters cu succes %s\n"
 
-#: ../lib/fsp.c:477
-#: ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Eroare: Nu am putut șterge directorul %s: %s\n"
 
-#: ../lib/fsp.c:506
-#: ../lib/local.c:522
-#: ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Eroare: Nu am putut șterge fișierul %s: %s\n"
 
-#: ../lib/fsp.c:528
-#: ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Am creat cu succes directorul %s\n"
 
-#: ../lib/fsp.c:563
-#: ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Am redenumit cu succes %s în %s\n"
 
-#: ../lib/fsp.c:575
-#: ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Eroare: Nu am putut redenumi %s în %s: %s\n"
 
-#: ../lib/ftps.c:156
-msgid "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "Suportul FTPS nu este disponibil din moment ce nu a fost compilat suportul pentru SSL. Anulez 
conexiunea.\n"
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Suportul FTPS nu este disponibil din moment ce nu a fost compilat suportul "
+"pentru SSL. Anulez conexiunea.\n"
 
-#: ../lib/https.c:91
-msgid "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "Suportul HTTPS nu este disponibil din moment ce nu a fost compilat suportul pentru SSL. Anulez 
conexiunea.\n"
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Suportul HTTPS nu este disponibil din moment ce nu a fost compilat suportul "
+"pentru SSL. Anulez conexiunea.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Nu am putut obține directorul de lucru curent: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Am schimbat cu succes directorul local la %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Nu am putut schimba directorul local la %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Eroare: Nu am putut trunchia fișierul local %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Nu am putut obține listarea directorului local %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Am schimbat cu succes modul lui %s în %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Eroare: Nu am putut schimba modul lui %s în %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
-#| msgid "Successfully changed directory to %s\n"
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Data a fost schimbată cu succes pentru %s\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
-#| msgid "Error: Could not change mode of %s to %o: %s\n"
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Eroare: Nu s-a putut schimba data pentru %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "sistemul de fișiere local"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "utilizare: gftp "
 
-#. @null@
-#: ../lib/options.h:25
-#: ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nici unul"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fișier"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "mărime"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "utilizator"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grup"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "dată"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atribute"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "descendent"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ascendent"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "General"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Program vizualizare:"
 
-#: ../lib/options.h:44
-msgid "The default program used to view files. If this is blank, the internal file viewer will be used"
-msgstr "Programul implicit pentru a vizualiza fișiere. Dacă este gol, vizualizatorul intern va fi folosit"
+#: lib/options.h:44
+msgid ""
+"The default program used to view files. If this is blank, the internal file "
+"viewer will be used"
+msgstr ""
+"Programul implicit pentru a vizualiza fișiere. Dacă este gol, vizualizatorul "
+"intern va fi folosit"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Program editare:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Programul implicit pentru editarea fișierelor."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Mărime maximă a ferestrei de log:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Mărimea maximă a ferestrei de log în bytes pentru versiunea GTK+"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Seturile de caractere la distanță:"
 
-#: ../lib/options.h:54
-msgid "This is a comma separated list of charsets to try to convert the remote messages to the current 
locale"
-msgstr "Aceasta este o listă de seturi de caractere separate prin virgulă folosită pentru a converti 
mesajele de la distanță la configurările locale curente"
+#: lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
+msgstr ""
+"Aceasta este o listă de seturi de caractere separate prin virgulă folosită "
+"pentru a converti mesajele de la distanță la configurările locale curente"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "LC_TIME la distanță:"
 
-#: ../lib/options.h:58
-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 "Aceasta este valoarea LC_TIME pentru situl la distanță. Este necesară pentru parsarea corectă a 
datelor din listarea directoarelor."
+#: lib/options.h:58
+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 ""
+"Aceasta este valoarea LC_TIME pentru situl la distanță. Este necesară pentru "
+"parsarea corectă a datelor din listarea directoarelor."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
-msgstr "Numărul de secunde pentru care vor fi reținute intrările cache înainte de a expira."
+msgstr ""
+"Numărul de secunde pentru care vor fi reținute intrările cache înainte de a "
+"expira."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Adaugă transferurile de fișiere"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Adaugă transferurile noi de fișiere la cele existente"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Transferă un sigur fișier odată"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Transferați un singur fișier odată?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Implicit suprascrie"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
-msgstr "Suprascrie implicit fișierele sau setați pentru reluarea transferului de fișiere"
+msgstr ""
+"Suprascrie implicit fișierele sau setați pentru reluarea transferului de "
+"fișiere"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Păstrează permisiunile fișierelor"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Păstrează permisiunile fișierelor transferate"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Păstrează data fișierului"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Păstrează data fișierelor transferate"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Actualizare după fiecare fișier transferat"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Reactualizează lista după fiecare fișier transferat"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Afișează directoarele mai întâi"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Afișează mai întâi directoarele apoi fișierele"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Arată fișierele ascunse"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Arată fișierele ascunse în listă"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Arată statusul transferului în titlu"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Arată statusul pentru transferul de fișiere în bara de titlu"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Pornește transferul de fișiere"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Pornește automat transferul de fișiere când sunt puse în coadă"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Permite comenzi manuale în GUI"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr "Permite introducerea comenzilor manuale în GUI (funcții precum cele din versiunea text)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+"Permite introducerea comenzilor manuale în GUI (funcții precum cele din "
+"versiunea text)"
 
-#: ../lib/options.h:111
-#| msgid "Remove a local directory"
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Ține minte ultimul dosar"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr "La închiderea aplicației, salvează ultimul dosar deschis local și la distanță"
+msgstr ""
+"La închiderea aplicației, salvează ultimul dosar deschis local și la distanță"
 
-#: ../lib/options.h:115
-#| msgid "Disconnect from the remote server"
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "La pornire, fă o conexiune la serverul la distanță"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "La pornire, fă automat o conexiune către serverul de la distanță."
 
-#: ../lib/options.h:120
-#: ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rețea"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Timp expirare pentru rețea:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "Timpul în care expiră așteptarea pentru activitate în rețea. Acesta NU este o expirare pentru rețea 
neutilizată. "
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"Timpul în care expiră așteptarea pentru activitate în rețea. Acesta NU este "
+"o expirare pentru rețea neutilizată. "
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Reîncercări conectare:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "Numărul de auto-reîncercări de realizat. Setați-l la 0 pentru a reîncerca la infinit"
+msgstr ""
+"Numărul de auto-reîncercări de realizat. Setați-l la 0 pentru a reîncerca la "
+"infinit"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Pauza dintre reîncercări:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Numărul de secunde de așteptat între reîncercări"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "KB/s max:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
-msgstr "Maximul de KB/s pe care îl poate obține un transfer de fișiere. (setați-l la 0 pentru dezactivare)"
+msgstr ""
+"Maximul de KB/s pe care îl poate obține un transfer de fișiere. (setați-l la "
+"0 pentru dezactivare)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Mărimea blocului de transfer:"
 
-#: ../lib/options.h:144
-msgid "The block size that is used when transfering files. This should be a multiple of 1024."
-msgstr "Mărimea blocului folosit la transferul fișierelor. Ar trebui să fie un multiplu de 1024."
+#: lib/options.h:144
+#, fuzzy
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+"Mărimea blocului folosit la transferul fișierelor. Ar trebui să fie un "
+"multiplu de 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Protocolul implicit:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Specifică protocolul implicit care va fi folosit"
 
-#: ../lib/options.h:151
-#: ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Activează suportul IPv6"
 
-#: ../lib/options.h:159
-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 "Definește ce se va întâmpla în momentul executării unui dublu-click pe un fișier din lista de 
fișiere. 0=Vizualizează fișierul 1=Editează fișierul 2=Transferă fișierul"
+#: lib/options.h:159
+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 ""
+"Definește ce se va întâmpla în momentul executării unui dublu-click pe un "
+"fișier din lista de fișiere. 0=Vizualizează fișierul 1=Editează fișierul "
+"2=Transferă fișierul"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Lățimea implicită pentru caseta cu lista fișierelor locale"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Lățimea implicită pentru caseta cu lista fișierelor la distanță"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
-msgstr "Înălțimea implicită pentru casetele cu lista fișierelor locale/la distanță"
+msgstr ""
+"Înălțimea implicită pentru casetele cu lista fișierelor locale/la distanță"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Înălțimea implicită pentru caseta cu lista fișierelor transferate"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Înălțimea implicită pentru fereastra de logare"
 
-#: ../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 "Lățimea coloanei numelor de fișiere din ferestra de transfer. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei."
+#: 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 ""
+"Lățimea coloanei numelor de fișiere din ferestra de transfer. Setați-o la 0 "
+"pentru adaptarea automată a lățimii coloanei."
 
-#: ../lib/options.h:190
-#: ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Coloana implicită pentru sortare"
 
-#: ../lib/options.h:193
-#: ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortare ascendentă sau descendentă"
 
-#: ../lib/options.h:203
-#: ../lib/options.h:221
-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 "Lățimea coloanei numelor fișierelor din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:206
-#: ../lib/options.h:224
-msgid "The width of the size column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Lățimea coloanei de mărime fișier din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:209
-#: ../lib/options.h:227
-msgid "The width of the user column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Lățimea coloanei de nume utilizator din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:212
-#: ../lib/options.h:230
-msgid "The width of the group column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Lățimea coloanei de grup utilizator din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:215
-#: ../lib/options.h:233
-msgid "The width of the date column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Lățimea coloanei de dată fișier din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:218
-#: ../lib/options.h:236
-msgid "The width of the attribs column in the file listboxes. Set this to 0 to have this column 
automagically resize. Set this to -1 to disable this column"
-msgstr "Lățimea coloanei de atribute fișier din casetele cu lista fișierelor. Setați-o la 0 pentru adaptarea 
automată a lățimii coloanei. Setați-o la -1 pentru a dezactiva această coloană."
-
-#: ../lib/options.h:239
+#: lib/options.h:203 lib/options.h:221
+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 ""
+"Lățimea coloanei numelor fișierelor din casetele cu lista fișierelor. Setați-"
+"o la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:206 lib/options.h:224
+msgid ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Lățimea coloanei de mărime fișier din casetele cu lista fișierelor. Setați-o "
+"la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:209 lib/options.h:227
+msgid ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Lățimea coloanei de nume utilizator din casetele cu lista fișierelor. Setați-"
+"o la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:212 lib/options.h:230
+msgid ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Lățimea coloanei de grup utilizator din casetele cu lista fișierelor. Setați-"
+"o la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:215 lib/options.h:233
+msgid ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Lățimea coloanei de dată fișier din casetele cu lista fișierelor. Setați-o "
+"la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:218 lib/options.h:236
+msgid ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Lățimea coloanei de atribute fișier din casetele cu lista fișierelor. Setați-"
+"o la 0 pentru adaptarea automată a lățimii coloanei. Setați-o la -1 pentru a "
+"dezactiva această coloană."
+
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Culoarea comenzilor care sunt trimise serverului"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Culoarea comenzilor care sunt recepționate de server"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Culoarea mesajelor de eroare"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Culoarea restului de mesaje de logare"
 
-#: ../lib/options.h:254
-#: ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257
-#: ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262
-#: ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265
-#: ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Local"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274
-#: ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Favorit"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Transferul de fișiere va fi făcut la %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Eroare la setarea LC_TIME la „%s”. Folosesc în continuare „%s”\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Încarc listarea directorului %s din cache (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Încarc listarea directorului %s de la server (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
-msgid "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't match the current directory 
(%s)\n"
-msgstr "Atenție: Elimin calea din fișierul „%s”. Calea eliminată (%s) nu se potrivește directorului curent 
(%s)\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
+msgstr ""
+"Atenție: Elimin calea din fișierul „%s”. Calea eliminată (%s) nu se "
+"potrivește directorului curent (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Eroare: Nu pot scrie în cache: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Eroare: Nu am putut găsi favoritul %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Eroare favorite: Intrarea %s nu are setat un nume de gazdă\n"
 
-#: ../lib/protocols.c:645
-#: ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protocolul „%s” nu este suportat pentru moment.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "S-a găsit o legătură simbolică recursivă %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "Eroare: Site-ul la distanță %s este deconectat. Numărul maxim de reîncercări atins...renunț\n"
+msgstr ""
+"Eroare: Site-ul la distanță %s este deconectat. Numărul maxim de reîncercări "
+"atins...renunț\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "Eroare: Site-ul la distanță %s deconectat. Mă reconectez în %d secunde\n"
+msgstr ""
+"Eroare: Site-ul la distanță %s deconectat. Mă reconectez în %d secunde\n"
 
-#: ../lib/protocols.c:1636
-#: ../lib/rfc959.c:715
-#: ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Eroare: Nu am putut seta close pe fanionul exec: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Nu pot deschide pty %s principal: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Nu pot crea un socket pereche: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Eroare: Nu pot executa ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Nu pot bifurca un alt proces: %s\n"
 
-#: ../lib/rfc2068.c:30
-#: ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Nume gazdă proxy:"
 
-#: ../lib/rfc2068.c:32
-#: ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Nume gazdă firewall"
 
-#: ../lib/rfc2068.c:33
-#: ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Port proxy:"
 
-#: ../lib/rfc2068.c:35
-#: ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port pentru conectarea la firewall"
 
-#: ../lib/rfc2068.c:36
-#: ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Nume utilizator proxy:"
 
-#: ../lib/rfc2068.c:38
-#: ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Numele de utilizator pentru firewall"
 
-#: ../lib/rfc2068.c:39
-#: ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Parolă proxy:"
 
-#: ../lib/rfc2068.c:41
-#: ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Parola pentru firewall"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Folosește HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vreți să folosiți HTTP/1.1 sau HTTP/1.0"
 
-#: ../lib/rfc2068.c:151
-#: ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -888,506 +929,532 @@ msgstr ""
 "Am primit răspuns greșit de la server, mă deconectez\n"
 "Mărime invalidă „%s” a blocului returnată de serverul la distanță\n"
 
-#: ../lib/rfc2068.c:255
-#: ../lib/rfc959.c:679
-#: ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Mă deconectez de la situl %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Pornesc transferul de fișiere decalat de la "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nu am putut primi fișierul %s\n"
 
-#: ../lib/rfc2068.c:421
-#: ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Primesc listarea directorului...\n"
 
-#: ../lib/rfc2068.c:816
-#: ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Am primit răspuns greșit de la server, mă deconectez\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "comandă SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "utilizator gazdă"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "utilizator gazdă:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "utilizator gazdă port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "utilizator gazdă NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Personalizat"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Adresă email:"
 
-#: ../lib/rfc959.c:45
-msgid "This is the password that will be used whenever you log into a remote FTP server as anonymous"
-msgstr "Aceasta este parola ce va fi folosită la fiecare logare ca anonymous la un server FTP la distanță"
+#: lib/rfc959.c:45
+msgid ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
+msgstr ""
+"Aceasta este parola ce va fi folosită la fiecare logare ca anonymous la un "
+"server FTP la distanță"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Cont proxy:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Contul pentru firewall (opțional)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Tip server proxy:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
-msgid "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement 
string prefixed by a % that will be replaced with the proper data. The first character can be either p for 
proxy or h for the 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 "Aceasta specifică cum se așteaptă serverul proxy să ne logăm. Puteți specifica un șir de 2 caractere 
precedat de un % ce va fi înlocuit cu datele corespunzătoare. Primul caracter poate fi fie un p pentru proxy 
sau un h pentru serverul FTP. Al doilea caracter poate fi u (utilizator), p (parola), h (gazda), o (port) sau 
a (cont). Spre exemplu, pentru a specifica utilizatorul pentru proxy, puteți scrie %pu"
-
-#: ../lib/rfc959.c:69
+msgid ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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 ""
+"Aceasta specifică cum se așteaptă serverul proxy să ne logăm. Puteți "
+"specifica un șir de 2 caractere precedat de un % ce va fi înlocuit cu datele "
+"corespunzătoare. Primul caracter poate fi fie un p pentru proxy sau un h "
+"pentru serverul FTP. Al doilea caracter poate fi u (utilizator), p (parola), "
+"h (gazda), o (port) sau a (cont). Spre exemplu, pentru a specifica "
+"utilizatorul pentru proxy, puteți scrie %pu"
+
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignoră adresa PASV"
 
-#: ../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 "Dacă aceasta este activată, atunci câmpul de adrese IP PASV al serverului FTP distant va fi ignorat 
și adresa IP a gazdei va fi folosită în schimb. Acest lucru este adesea necesar pentru rutere ce furnizează 
adresa IP internă mai degrabă decât cea externă în răspunsul PASV."
+#: 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 ""
+"Dacă aceasta este activată, atunci câmpul de adrese IP PASV al serverului "
+"FTP distant va fi ignorat și adresa IP a gazdei va fi folosită în schimb. "
+"Acest lucru este adesea necesar pentru rutere ce furnizează adresa IP "
+"internă mai degrabă decât cea externă în răspunsul PASV."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Transferuri pasive de fișiere"
 
-#: ../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. Generally, it is a good idea to keep this enabled unless 
you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open 
up a port on the client side and the remote server will attempt to connect to it."
-msgstr "Dacă aceasta este activată, atunci serverul distant FTP va deschide un port pentru conexiunea de 
date. Dacă sunteți în spatele unui firewall, va trebui să activați această setare. În general, este o idee 
bună să activați această setare cu excepția cazurilor în care vă conectați la un server vechi FTP ce nu 
suportă acest lucru. Dacă este dezactivat, atuci gFTP va deschide un port la client iar serverul distant va 
încerca să se conecteze la acesta."
-
-#: ../lib/rfc959.c:79
+#: 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. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
+msgstr ""
+"Dacă aceasta este activată, atunci serverul distant FTP va deschide un port "
+"pentru conexiunea de date. Dacă sunteți în spatele unui firewall, va trebui "
+"să activați această setare. În general, este o idee bună să activați această "
+"setare cu excepția cazurilor în care vă conectați la un server vechi FTP ce "
+"nu suportă acest lucru. Dacă este dezactivat, atuci gFTP va deschide un port "
+"la client iar serverul distant va încerca să se conecteze la acesta."
+
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Rezolvă legăturile simbolice la distanță (LIST -L)"
 
-#: ../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 will want to disable this is if the remote FTP server doesn't 
support the -L option to LIST"
-msgstr "Serverul distant FTP va încerca să rezolve legăturile simbolice din listarea directorului. În 
general, este o idee bună să-l lăsați activat. Singura situație în care ați dori să dezactivați această 
setare ar fi dacă serverul FTP distant nu suportă opțiunea -L pentru LIST"
+#: 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 "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
+msgstr ""
+"Serverul distant FTP va încerca să rezolve legăturile simbolice din listarea "
+"directorului. În general, este o idee bună să-l lăsați activat. Singura "
+"situație în care ați dori să dezactivați această setare ar fi dacă serverul "
+"FTP distant nu suportă opțiunea -L pentru LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transferă fișierele în mod ASCII"
 
-#: ../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 text files. If you are transfering from UNIX to UNIX, 
then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
-msgstr "Dacă transferați un fișier text de pe Windows pe UNIX sau invers, atunci ar trebui să activați 
această setare. Fiecare sistem reprezintă liniile noi într-un mod diferit pentru fișierele text. Dacă 
transferați de pe UNIX pe UNIX, atunci îl puteți dezactiva. Dacă transferați fișiere binare, va trebui să 
dezactivați această setare."
+#: lib/rfc959.c:87
+#, fuzzy
+msgid ""
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
+"then you should enable this. Each system represents newlines differently for "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
+msgstr ""
+"Dacă transferați un fișier text de pe Windows pe UNIX sau invers, atunci ar "
+"trebui să activați această setare. Fiecare sistem reprezintă liniile noi "
+"într-un mod diferit pentru fișierele text. Dacă transferați de pe UNIX pe "
+"UNIX, atunci îl puteți dezactiva. Dacă transferați fișiere binare, va trebui "
+"să dezactivați această setare."
 
-#: ../lib/rfc959.c:381
-#: ../lib/rfc959.c:390
-#: ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849
-#: ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Răspuns invalid „%c” primit de la server.\n"
 
-#: ../lib/rfc959.c:706
-#: ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Nu am putut crea un socket IPv4: %s\n"
 
-#: ../lib/rfc959.c:745
-#: ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Nu am putut găsi o adresă IP în răspunsul la PASV '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "Ignor adresa IP în răspunsul PASV, conectare la %d.%d.%d.%d:%d\n"
 
-#: ../lib/rfc959.c:786
-#: ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Nu am putut crea o conexiune de date: %s\n"
 
-#: ../lib/rfc959.c:798
-#: ../lib/rfc959.c:819
-#: ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Nu pot obține numele socketului: %s\n"
 
-#: ../lib/rfc959.c:809
-#: ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Nu am putut lega un port: %s\n"
 
-#: ../lib/rfc959.c:828
-#: ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Nu am putut asculta la portul %d: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Nu am putut crea un socket IPv6: %s\n"
 
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Eroare: Se pare că nu ne conectăm folosind IPv6. Anulez conectarea.\n"
 
-#: ../lib/rfc959.c:923
-#: ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Răspuns invalid EPSV „%s”\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Nu pot obține adresa socketului local: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Nu pot accepta conexiune de la server: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "total"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Avertisment: Nu am putut parcurge listarea %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Caut %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Nu am putut căuta gazda %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Nu am putut crea un socket: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Încerc %s:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Nu mă pot conecta la %s: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Conectat la %s:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101
-#: ../lib/sshv2.c:1168
+#: 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 "Nu am putut găsi numele serviciului %s/tcp. Vă rugăm verificați fișierul serviciilor\n"
+msgstr ""
+"Nu am putut găsi numele serviciului %s/tcp. Vă rugăm verificați fișierul "
+"serviciilor\n"
 
-#: ../lib/sockutils.c:190
-#: ../lib/sockutils.c:268
-#: ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Conexiunea la %s a expirat\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Nu pot obține fanioanele pentru socket: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Nu pot seta socketul la non-blocant: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Nume program SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Calea către executabilul SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Parametri suplimentari SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Parametri suplimentari trimiși către programul SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Necesită utilizator/parolă SSH"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Necesită un utilizator/parolă pentru conectările SSH"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Rulez programul %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Introduceți parola pentru cheia RSA"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Introduceți parola pentru cheia '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Parolă"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "parolă"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(da/nu)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Introduceți PASSCODE:"
 
-#: ../lib/sshv2.c:518
-#: ../src/gtk/gtkui.c:142
-#: ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Introduceți parola"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Introduceți parola SecurID:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Eroare: A fost introdusă o parolă incorectă\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protocol de inițializare\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Versiune protocol %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Deschid %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Închid\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Deschid directorul %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Citesc directorul\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Șterg fișierul %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Creez directorul %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Șterg directorul %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Calea reală %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atribute fișier\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Status %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690
-#: ../src/gtk/bookmarks.c:1042
-#: ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253
-#: ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995
-#: ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Nu există un asemenea fișier sau director"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Permisiune refuzată"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Eșuare"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Mesaj greșit"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nici o conexiune"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Conexiune pierdută"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operațiune nesuportată"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Mesaj necunoscut returnat de server"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Eroare: Mărimea mesajului %d este prea mare\n"
 
-#: ../lib/sshv2.c:811
-#: ../lib/sshv2.c:1346
-#: ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Eroare: Mărimea %d a mesajului de la server este prea mare\n"
 
-#: ../lib/sshv2.c:817
-msgid "There was an error initializing a SSH connection with the remote server. The error message from the 
remote server follows:\n"
-msgstr "A intervenit o eroare la inițializarea unei conexiuni SSH cu serverul distant. Mesajul de eroare de 
la serverul distant a fost:\n"
+#: lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
+msgstr ""
+"A intervenit o eroare la inițializarea unei conexiuni SSH cu serverul "
+"distant. Mesajul de eroare de la serverul distant a fost:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Deschid conexiunea SSH către %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Logare cu succes la serverul SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Motorul SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Fișierul de entropie SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Fișierul de entropie SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Lungimea entropiei:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Numărul maxim de octeți pentru seed folosiți de motorul SSL"
 
-#: ../lib/sslcommon.c:41
-#: ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Verific conexiunea SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1400,133 +1467,134 @@ msgstr ""
 "Subiect = %s\n"
 "Eroare %i: %s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Nu pot obține certificarea perechii\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
-msgid "ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). 
Aborting connection.\n"
-msgstr "Eroare: Gazda din certificatul SSL (%s) nu este aceeași cu gazda la care ne conectăm (%s). Anulez 
conectarea.\n"
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
+msgstr ""
+"Eroare: Gazda din certificatul SSL (%s) nu este aceeași cu gazda la care ne "
+"conectăm (%s). Anulez conectarea.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Nu pot inițializa librăria OpenSSL\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Eroare la încărcarea certificatelor SSL implicite\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Eroare la setarea listei cifrurilor (nici un cifru valid)\n"
 
-#: ../lib/sslcommon.c:349
-#: ../lib/sslcommon.c:423
-#: ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Eroare: Motorul SSL nu a fost inițializat\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Eroare la pregătirea conexiunii SSL (obiect BIO)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Eroare la pregătirea conexiunii SSL (obiect SSL)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Eroare cu certificatul pereche: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operațiune anulată\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Aștept %d secunde înainte de a mă reconecta\n"
 
-#: ../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 vine FĂRĂ ABSOLUT NICI O GARANȚIE; pentru detalii, citiți fișierul COPYING. Acesta este un 
software liber, și îl puteți redistribui în anumite condiții; pentru detalii, citiți fișierul COPYING\n"
+#: 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 vine FĂRĂ ABSOLUT NICI O GARANȚIE; pentru detalii, citiți fișierul "
+"COPYING. Acesta este un software liber, și îl puteți redistribui în anumite "
+"condiții; pentru detalii, citiți fișierul COPYING\n"
 
-#: ../src/uicommon/gftpui.c:158
-#: ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Tradus în română de: Mugurel Tudor <mugurelu gnome ro>"
 
-#: ../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
+#: 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 "Eroare: Nu sunt conectat la un site la distanță\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "utilizare: chmod <mod> <fisier>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "utilizare: rename <nume vechi> <nume nou>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "utilizare: delete <fișier>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "utilizare: rmdir <director>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "utilizare: site <comandă site>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "utilizare: mkdir <director nou>\n"
 
-#: ../src/uicommon/gftpui.c:435
-#: ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "utilizare: chdir <director>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Argument invalid\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Șterge cache-ul directorului\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "utilizare: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "utilizare: set [variabilă = valoare]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Eroare: Variabila %s nu este o variabilă validă de configurare.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Eroare: Variabila %s nu este disponibilă în varianta text a gFTP.\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1534,327 +1602,324 @@ msgstr ""
 "Comenzi suportate:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "utilizare: %s <fișier>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "despre"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Arată informații gFTP"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Setează modul curent de transfer fișiere la Ascii (doar pentru FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Setează modul curent de transfer fișiere la Binar (doar pentru FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944
-#: ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Schimbă directorul de lucru de la distanță"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Schimbă permisiunile asupra unui fișier de la distanță"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "șterge"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Opțiuni disponibile: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Deconectează de la site-ul la distanță"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Șterge un fișier de la distanță"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Listează directorul curent de la distanță"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Transferă fișierul(e) de la distanță"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Arată acest ecran de ajutor"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Schimbă directorul de lucru local"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Schimbă permisiunile unui fișier local"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Șterge un fișier local"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Listează directorul local curent"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Crează un director local"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Arată directorul local curent"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Redenumește un fișier local"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Șterge un director local"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Creează un director la distanță"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Încarcă fișierul(e) local(e)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Deschide o conexiune către un site la distanță"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Arată directorul curent la distanță"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Părăsește gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Redenumește un fișier la distanță"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Șterge un director la distanță"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "Arată variabilele fișierului de configurare. Puteți seta variabilele prin setarea set=valoare"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"Arată variabilele fișierului de configurare. Puteți seta variabilele prin "
+"setarea set=valoare"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Rulează o comandă specifică site"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Eroare: Comanda nu este recunoscută\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Am transferat cu succes %s la %.2f KB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Omit fișierul %s de pe gazda %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Opresc transferul de pe gazda %s\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nu am putut transfera %s de la %s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "There were %d files or directories that could not be transferred. Check the log for which items were 
not properly transferred."
-msgstr "%d de fișiere sau dosare nu au putut fi transferate. Pentru a verifica elementele care nu au fost 
transferate, verificați jurnalul."
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+"%d de fișiere sau dosare nu au putut fi transferate. Pentru a verifica "
+"elementele care nu au fost transferate, verificați jurnalul."
 
-#: ../src/gtk/bookmarks.c:40
-#: ../src/gtk/dnd.c:122
-#: ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103
-#: ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Vă rugăm apăsați butonul stop înainte de a face altceva\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Conectare la favorit"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Adăugare favorit: Trebuie să introduceți un nume pentru favorit\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "Adăugare favorit: Nu pot adăuga favoritul %s pentru că numele există deja.\n"
+msgstr ""
+"Adăugare favorit: Nu pot adăuga favoritul %s pentru că numele există deja.\n"
 
-#: ../src/gtk/bookmarks.c:135
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Adaugă favorit"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Adaugare favorit: Trebuie să introduceți numele gazdei\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1864,37 +1929,32 @@ msgstr ""
 "Puteți separa elementele punând un / într-un submeniu\n"
 "(ex: Situri Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Memorează parola"
 
-#: ../src/gtk/bookmarks.c:420
-#| msgid "Add Bookmark: You must enter a name for the bookmark\n"
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Trebuie să introduceți un nume pentru favorit."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Director nou"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Introduceți numele noului director care va fi creat"
 
-#: ../src/gtk/bookmarks.c:482
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Element nou"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Introduceți numele noului element care va fi creat"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
-#| msgid ""
-#| "Are you sure you want to erase the bookmark\n"
-#| "%s and all it's children?"
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
@@ -1902,118 +1962,99 @@ msgstr ""
 "Sunteți sigur că doriți să ștergeți favoritul\n"
 "%s și toți descendenții?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Șterge favorit"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Favorite"
 
-#: ../src/gtk/bookmarks.c:849
-#: ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Editează intrarea"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Descriere:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Nume gazdă:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Director la distanță:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Director local:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Nume utilizator:"
 
-#: ../src/gtk/bookmarks.c:1000
-#: ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Cont:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Logare ca ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1053
-#: ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265
-#: ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216
-#: ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Anulează  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Fișier/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
-#| msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Fișier/_Director nou..."
 
-#: ../src/gtk/bookmarks.c:1207
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Fișier/_Element nou..."
 
-#: ../src/gtk/bookmarks.c:1208
-#| msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Fișier/Ș_terge"
 
-#: ../src/gtk/bookmarks.c:1209
-#| msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Fișier/_Proprietăți..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Fișier/sep"
 
-#: ../src/gtk/bookmarks.c:1211
-#| msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Fișier/În_chide"
 
-#: ../src/gtk/bookmarks.c:1229
-#: ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Editare favorite"
 
-#: ../src/gtk/chmod_dialog.c:132
-#: ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2021,101 +2062,91 @@ msgstr ""
 "Puteți acum ajusta atributele fișierului(lor)\n"
 "Notă: Nu toate serverele ftp suportă opțiunea chmod"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Special"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Persistent"
 
-#: ../src/gtk/chmod_dialog.c:192
-#: ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Utilizator"
 
-#: ../src/gtk/chmod_dialog.c:200
-#: ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Citire"
 
-#: ../src/gtk/chmod_dialog.c:204
-#: ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Scriere"
 
-#: ../src/gtk/chmod_dialog.c:208
-#: ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Execuție"
 
-#: ../src/gtk/chmod_dialog.c:212
-#: ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Alții"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
-msgstr "Sunteți sigur că doriți să ștergeți aceste %ld fișiere și %ld directoare"
+msgstr ""
+"Sunteți sigur că doriți să ștergeți aceste %ld fișiere și %ld directoare"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Sunteți sigur că doriți să ștergeți aceste %ld fișiere"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Sunteți sigur că doriți să ștergeți aceste %ld directoare"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Șterge fișiere/directoare"
 
-#: ../src/gtk/delete_dialog.c:90
-#: ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../src/gtk/dnd.c:123
-#: ../src/gtk/gftp-gtk.c:1104
-#: ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Conectează"
 
-#: ../src/gtk/dnd.c:136
-#: ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL primit %s\n"
 
-#: ../src/gtk/dnd.c:159
-#: ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Tragere și plasare"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Ieșire"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2123,620 +2154,531 @@ msgstr ""
 "Există transferuri de fișiere în desfășurare.\n"
 "Sunteți sigur că doriți să ieșiți ?"
 
-#: ../src/gtk/gftp-gtk.c:219
-#: ../src/gtk/gftp-gtk.c:235
-#| msgid "Options"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Deschide locație"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Introduceți un URL pentru conectare"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
-#| msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Fereastra _1"
 
-#: ../src/gtk/gftp-gtk.c:269
-#| msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Fereastra _2"
 
-#: ../src/gtk/gftp-gtk.c:271
-#: ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
-#| msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
-#| msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binar"
 
-#: ../src/gtk/gftp-gtk.c:277
-#| msgid "/File/Properties..."
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferințe..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Ieșire"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Local"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Local/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-#| msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Deschide locație..."
 
-#: ../src/gtk/gftp-gtk.c:285
-#| msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_econectează"
 
-#: ../src/gtk/gftp-gtk.c:286
-#: ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Local/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
-#| msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Schimbă _filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
-#| msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/Arată _selecția"
 
-#: ../src/gtk/gftp-gtk.c:290
-#| msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Selecte_ază tot"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Local/Selectează toate fișierele"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Local/Deselectează tot"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Local/Salvează listarea directorului..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Local/Trimite comandă SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
-#| msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/S_chimbă dosar"
 
-#: ../src/gtk/gftp-gtk.c:297
-#| msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permisiuni..."
 
-#: ../src/gtk/gftp-gtk.c:299
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/Dosar _nou..."
 
-#: ../src/gtk/gftp-gtk.c:300
-#| msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Redenu_mește..."
 
-#: ../src/gtk/gftp-gtk.c:302
-#| msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/Ș_terge..."
 
-#: ../src/gtk/gftp-gtk.c:304
-#| msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Editează..."
 
-#: ../src/gtk/gftp-gtk.c:305
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_Vizualizează..."
 
-#: ../src/gtk/gftp-gtk.c:306
-#| msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Local/_Actualizează"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_La distanță"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/La distanță/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
-#| msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/La distanță/Deschide _locația..."
 
-#: ../src/gtk/gftp-gtk.c:312
-#| msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/La distanță/D_econectează"
 
-#: ../src/gtk/gftp-gtk.c:314
-#: ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/La distanță/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
-#| msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/La distanță/Schimbă _filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
-#| msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/La distanță/Arată _selecția"
 
-#: ../src/gtk/gftp-gtk.c:318
-#| msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/La distanță/Selecte_ază tot"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/La distanță/Selectează toate fișierele"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/La distanță/Deselectează tot"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/La distanță/Salvează listarea directorului..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/La distanță/Trimite comandă SITE..."
 
-#: ../src/gtk/gftp-gtk.c:324
-#| msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/La distanță/S_chimbă dosar"
 
-#: ../src/gtk/gftp-gtk.c:325
-#| msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/La distanță/_Permisiuni..."
 
-#: ../src/gtk/gftp-gtk.c:326
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/La distanță/Dosar _nou..."
 
-#: ../src/gtk/gftp-gtk.c:328
-#| msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/La distanță/Redenu_mește..."
 
-#: ../src/gtk/gftp-gtk.c:330
-#| msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/La distanță/Ș_terge..."
 
-#: ../src/gtk/gftp-gtk.c:331
-#| msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/La distanță/_Editează..."
 
-#: ../src/gtk/gftp-gtk.c:332
-#| msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/La distanță/_Vizualizează..."
 
-#: ../src/gtk/gftp-gtk.c:333
-#| msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/La distanță/_Actualizează"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Favo_rite"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Favorite/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-#| msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Favorite/Adaugă _favorit"
 
-#: ../src/gtk/gftp-gtk.c:339
-#| msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Favorite/Modifică favorite"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Favorite/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
-#| msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transfer"
 
-#: ../src/gtk/gftp-gtk.c:342
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transfer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transfer/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transfer/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346
-#: ../src/gtk/gftp-gtk.c:354
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
-#| msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transfer/Omite fișierul _curent"
 
-#: ../src/gtk/gftp-gtk.c:348
-#| msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transfer/Ște_rge fișierul"
 
-#: ../src/gtk/gftp-gtk.c:350
-#| msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transfer/M_ută fișierul sus"
 
-#: ../src/gtk/gftp-gtk.c:352
-#| msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transfer/Mută fișierul _jos"
 
-#: ../src/gtk/gftp-gtk.c:355
-#| msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfer/_Adu fișiere"
 
-#: ../src/gtk/gftp-gtk.c:356
-#| msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transfer/_Pune fișiere"
 
-#: ../src/gtk/gftp-gtk.c:357
-#| msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
-#| msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
-#| msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Curăță"
 
-#: ../src/gtk/gftp-gtk.c:360
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_Vezi"
 
-#: ../src/gtk/gftp-gtk.c:361
-#| msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Salvează..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Unelte"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Unelte/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
-#| msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Unelte/C_ompară ferestrele"
 
-#: ../src/gtk/gftp-gtk.c:365
-#| msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Unelte/_Curăță cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/_Ajutor"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Ajutor/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
-#| msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Ajutor/_Despre"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Gazdă: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Gazdă: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Utilizator: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Utilizator: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Parolă: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Comandă: "
 
-#: ../src/gtk/gftp-gtk.c:787
-#: ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Nume fișier"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Mărime"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dată"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atribute"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progres"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Eroare: Trebuie să introduceți o gazdă pentru conectare\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Actualizează"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Introduceți nume utilizator"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Vă rugăm introduceți numele de utilizator pentru acest site"
 
-#: ../src/gtk/gtkui.c:143
-#: ../src/gtk/transfer.c:563
-#: ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Vă rugăm introduceți parola pentru acest site"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operațiune anulată...trebuie să introduceți un text\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Creează director"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Introduceți numele directorului care va fi creat"
 
-#: ../src/gtk/gtkui.c:370
-#: ../src/gtk/gtkui.c:382
-#: ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Redenumește"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Cum vreți să redenumiți %s?"
 
-#: ../src/gtk/gtkui.c:402
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Sit"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Introduceți comanda specifică sit"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Prefixează cu SITE"
 
-#: ../src/gtk/gtkui.c:449
-#: ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60
-#: ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541
-#: ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Sărit"
 
-#: ../src/gtk/gtkui_transfer.c:62
-#: ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Aștept..."
 
-#: ../src/gtk/gtkui_transfer.c:136
-#: ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Suprascriere"
 
-#: ../src/gtk/gtkui_transfer.c:143
-#: ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Reluare"
 
-#: ../src/gtk/gtkui_transfer.c:150
-#: ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Omitere"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Acțiune"
 
-#: ../src/gtk/gtkui_transfer.c:236
-#: ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Transfer fișierele"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr ""
-"Următorul fișier(e) există atât pe calculatorul local cât și pe cel la distanță\n"
+"Următorul fișier(e) există atât pe calculatorul local cât și pe cel la "
+"distanță\n"
 "Vă rugăm selectați ce doriți să faceți"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Eroare"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Omite fișier"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Selectează tot"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Deselectează tot"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Schimbă filtrul: Operațiunea anulată...trebuie să introduceți un text\n"
+msgstr ""
+"Schimbă filtrul: Operațiunea anulată...trebuie să introduceți un text\n"
 
-#: ../src/gtk/menu-items.c:83
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Schimbă filtrul"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Introduceți noul filtru pentru fișiere"
 
-#: ../src/gtk/menu-items.c:114
-#: ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363
-#: ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Eroare: Nu am putut deschide %s pentru scriere: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Salvează listarea directorului"
 
-#: ../src/gtk/menu-items.c:327
-#: ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Eroare: Eroare la scrierea %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Am scris cu succes fișierul log către %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Salvează log"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
-msgid "Cannot find the license agreement file COPYING. Please make sure it is in either %s or in %s"
-msgstr "Nu am putut găsi fișierul licență COPYING. Asigurați-vă că este fie în %s fie în %s"
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
+msgstr ""
+"Nu am putut găsi fișierul licență COPYING. Asigurați-vă că este fie în %s "
+"fie în %s"
 
-#: ../src/gtk/menu-items.c:454
-#: ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Despre gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
-#| msgid ""
-#| "%s\n"
-#| "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
-#| "Official Homepage: http://www.gftp.org/\n";
-#| "Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgid ""
 "%s\n"
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
@@ -2747,99 +2689,80 @@ msgstr ""
 "Pagină oficială: http://www.gftp.org/\n";
 "Siglă de: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Despre"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licența de folosire"
 
-#: ../src/gtk/menu-items.c:558
-#: ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Închide  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Compară ferestrele"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Deconectare de la site-ul distant"
 
-#: ../src/gtk/misc-gtk.c:261
-msgid "Connect to the site specified in the host entry. If the host entry is blank, then a dialog is 
presented that will allow you to enter a URL."
-msgstr "Conectare la situl specificat în intrarea pentru gazdă. Dacă aceasta este necompletată, atunci un 
dialog vă va permite să introduceți un URL."
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+"Conectare la situl specificat în intrarea pentru gazdă. Dacă aceasta este "
+"necompletată, atunci un dialog vă va permite să introduceți un URL."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Toate fișierele"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (în cache) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nu sunt conectat"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Eroare la deschiderea fișierului %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Nu sunt conectat la un site la distanță\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Această facilitate nu este disponibilă folosind acest protocol\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Trebuie să aveți doar un element selectat\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Trebuie să aveți cel puțin un element selectat\n"
 
-#: ../src/gtk/misc-gtk.c:926
-#: ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Schimbă"
 
-#: ../src/gtk/misc-gtk.c:998
-#: ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Adaugă"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Anulează"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Da  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nu  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Obțin listarea directorului"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2848,114 +2771,89 @@ msgstr ""
 "Am recepționat %ld directoare\n"
 "și %ld fișiere"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Eroare gFTP: Nu am putut găsi fișierul %s în %s sau %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Editează gazda"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Adaugă gazda"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Tip:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../src/gtk/options_dialog.c:1014
-#: ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domeniu"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Adresă rețea"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Adresă _rețea:"
 
-#: ../src/gtk/options_dialog.c:1088
-#: ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Mască rețea"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Mască r_ețea:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domeniu:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Mască rețea"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Gazde locale"
 
-#: ../src/gtk/options_dialog.c:1288
-#: ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Editare"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Editare"
-
-#: ../src/gtk/options_dialog.c:1367
-#: ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Opțiuni"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Aplică"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Primesc numele fișierelor..."
 
-#: ../src/gtk/transfer.c:63
-#: ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Mă conectez..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Transferă fișiere: Nu sunt conectat la un site la distanță\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Eroare: Copilul %d a returnat %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Copilul %d s-a terminat cu succes\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Eroare: Copilul %d nu s-a terminat normal\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Eroare: Nu am putut obține informații despre fișierul %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Fișierul %s nu a fost schimbat\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2964,135 +2862,176 @@ msgstr ""
 "Fișierul %s a fost modificat.\n"
 "Doriți să-l încărcați ?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Editează fișier"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Terminat"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
-#| msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "S-au trimis %s din %s la %.2fKB/s, timp estimat rămas %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Am primit %s din %s la %.2fKB/s, timp estimat rămas %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
-#| msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "S-au trimis %s din %s, transfer împotmolit, timp rămas necunoscut"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Am primit %s din %s, transfer împotmolit, timp rămas necunoscut"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Procentaj completat necunoscut. (Fișier %ld din %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% complet, timp estimat rămas %02d:%02d:%02d. (Fișier %ld din %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Primesc numele fișierelor...%s bytes"
 
-#: ../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
+#: 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 "Nici un transfer de fișiere nu este selectat\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Vizualizare"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Editare"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Vizualizare: %s este un director. Nu îl pot vizualiza.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Editare: %s este un director. Nu îl pot edita.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Editare: Trebuie să specificați un editor în dialogul de opțiuni\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Vizualizare: Nu pot bifurca un alt proces: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Rulez programul: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Deschid %s cu %s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Vizualizez fișierul %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Vizualizare: Nu pot deschide fișierul %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Nu am putut deschide terminalul de control %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Nume utilizator [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s deja există. (mărime sursă %s, mărime destinație %s):\n"
-"(o) suprascrie, (r)eia, (s)ări, (O) suprascrie tot, (R)eia tot, (S)ări tot: (%c)"
+"(o) suprascrie, (r)eia, (s)ări, (O) suprascrie tot, (R)eia tot, (S)ări tot: "
+"(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Anulează  "
+
+#~ msgid "Host: "
+#~ msgstr "Gazdă: "
+
+#~ msgid "User: "
+#~ msgstr "Utilizator: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Închide  "
+
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulează"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Da  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nu  "
+
+#~ msgid "Type:"
+#~ msgstr "Tip:"
+
+#~ msgid "Network Address"
+#~ msgstr "Adresă rețea"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editare"
+
+#~ msgid "Apply"
+#~ msgstr "Aplică"
 
 #~ msgid "\n"
 #~ msgstr "\n"
+
 #~ msgid "Startup Directory:"
 #~ msgstr "Director de pornire:"
+
 #~ msgid "The default directory gFTP will go to on startup"
 #~ msgstr "Directorul implicit pe care îl va folosi gFTP la pornire"
+
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr ""
 #~ "Eroare la conversia stringului „%s” în UTF-8 de la setarea locală curent: "
 #~ "%s\n"
+
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr ""
-#~ "Eroare la conversia stringului „%s” în setarea locală curentă din UTF-8: %"
-#~ "s\n"
+#~ "Eroare la conversia stringului „%s” în setarea locală curentă din UTF-8: "
+#~ "%s\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 "
@@ -3101,28 +3040,38 @@ msgstr ""
 #~ ">.Dacă aveți întrebări, comentarii sau sugestii despre acest program, vă "
 #~ "rugăm să ni le trimiteți prin email. Puteți afla întotdeauna ultimele "
 #~ "știri despre gFTP de pe site-ul nostru la http://www.gftp.org/\n";
+
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr ""
 #~ "Eroare: Deconectat de la site-ul la distanță după ce am încercat să "
 #~ "transfer fișierul\n"
+
 #~ msgid "There was an error transfering the file %s"
 #~ msgstr "A intervenit o eroare la transferul fișierului %s"
+
 #~ msgid "Connect via URL"
 #~ msgstr "Conectează via URL"
+
 #~ msgid "OpenURL"
 #~ msgstr "DeschideURL"
+
 #~ msgid "/FTP/_Options..."
 #~ msgstr "/FTP/_Opțiuni..."
+
 #~ msgid "/Local/Make Directory..."
 #~ msgstr "/Local/Creează director..."
+
 #~ msgid "/Remote/Make Directory..."
 #~ msgstr "/La distanță/Creează director..."
+
 #~ msgid "/Transfers/Start Transfer"
 #~ msgstr "/Transferuri/Pornește transfer"
+
 #~ msgid "/Transfers/Stop Transfer"
 #~ msgstr "/Transferuri/Oprește transfer"
+
 #~ msgid "/Logging/View log"
 #~ msgstr "/Logare/Vizualizează log"
+
 #~ msgid "Stopping the transfer of %s\n"
 #~ msgstr "Opresc transferul lui %s\n"
-
diff --git a/po/ru.po b/po/ru.po
index 8c12509..de791b0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,20 +4,20 @@
 # Valek Filippov  <frob df ru>, 2001-2002, 2004.
 # Vitaly Lipatov <lav altlinux ru>, 2002, 2003, 2004.
 # Alexander Orlov <alxorlov pochta ru>, 2007.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-2.0.19\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-23 13:14+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-03-24 11:17+0300\n"
 "Last-Translator: Alexander Orlov <alxorlov pochta ru>\n"
 "Language-Team: none\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/bookmark.c:38
 #, c-format
@@ -51,23 +51,31 @@ msgstr "Ошибка при закрытии файлового дескрипт
 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:3200
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Ошибка преобразования строки \"%s\" из кодировки \"%s\" в кодировку \"%s\": "
+"%s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Ошибка: Невозможно открыть локальный файл %s: %s\n"
 
-#: lib/config_file.c:143 lib/protocols.c:2901 lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Ошибка: Невозможно записать в сокет: %s\n"
 
-#: lib/config_file.c:151 lib/protocols.c:2823 lib/sshv2.c:445
-#: lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, 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"
@@ -77,7 +85,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"
@@ -94,7 +102,7 @@ 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 "
@@ -104,7 +112,7 @@ msgstr ""
 "пользоваться прокси-сервером (если он доступен). Синтаксис: 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"
@@ -112,53 +120,53 @@ msgstr ""
 "ext=расширение файла:XPM-файл:Текстовый или Двоичный (A или B):программа "
 "просмотра. Заметьте: все аргументы кроме расширения файла не обязательны"
 
-#: 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"
@@ -167,7 +175,7 @@ msgstr ""
 "<masneyb gftp 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 "
@@ -179,7 +187,7 @@ 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. "
@@ -190,13 +198,13 @@ msgstr ""
 "этому файлу, БУДУТ перезаписаны. Если запись содержит (*) в комментарии, вы "
 "не имеете возможности изменить её содержимое через gFTP"
 
-#: lib/config_file.c:1210 lib/protocols.c:391 lib/rfc2068.c:543
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
 #: lib/rfc2068.c:544
 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 ""
@@ -223,10 +231,11 @@ msgstr "Ошибка: Ошибка при закрытии файла: %s\n"
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Повреждённый список файлов с сервера FSP %s\n"
 
-#: lib/fsp.c:339 lib/fsp.c:340 lib/protocols.c:1578 lib/protocols.c:1579
-#: lib/protocols.c:1620 lib/protocols.c:1621 lib/protocols.c:1687
-#: lib/protocols.c:1694 lib/protocols.c:1770 lib/protocols.c:1771
-#: lib/protocols.c:1807
+#: 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 "неизвестный"
 
@@ -246,7 +255,7 @@ msgid "Could not change directory to %s\n"
 msgstr "Невозможно изменить каталог на %s\n"
 
 #: 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:288
+#: src/gtk/transfer.c:263 src/gtk/view_dialog.c:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Успешно удалено %s\n"
@@ -257,7 +266,7 @@ msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Ошибка: Невозможно удалить каталог %s: %s\n"
 
 #: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
-#: src/gtk/view_dialog.c:292
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Ошибка: Невозможно удалить файл %s: %s\n"
@@ -277,7 +286,7 @@ msgstr "%s успешно переименовано в %s\n"
 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"
@@ -342,16 +351,11 @@ msgstr "Ошибка: Невозможно изменить время для %s
 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:301 src/uicommon/gftpui.c:630
-#, c-format
-msgid "\n"
-msgstr "\n"
-
 #: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "нет"
@@ -482,7 +486,8 @@ msgid "Preserve file permissions"
 msgstr "Сохранять права на файлы"
 
 #: lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Сохранять права на перемещаемых файлах."
 
 #: lib/options.h:82
@@ -490,7 +495,8 @@ msgid "Preserve file time"
 msgstr "Сохранять время файлов"
 
 #: lib/options.h:85
-msgid "Preserve file times of transfered files"
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Сохранять время на перемещаемых файлах."
 
 #: lib/options.h:87
@@ -498,7 +504,8 @@ msgid "Refresh after each file transfer"
 msgstr "Обновлять после каждой передачи"
 
 #: lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Обновлять список файлов после каждой передачи."
 
 #: lib/options.h:92
@@ -551,7 +558,7 @@ msgstr "Запоминать последний каталог"
 #: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
-"Сохраняет последний локальный и удалённый каталог при закрытии " "программы."
+"Сохраняет последний локальный и удалённый каталог при закрытии программы."
 
 #: lib/options.h:115
 msgid "Connect to remote server on startup"
@@ -560,11 +567,10 @@ 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
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Сеть"
 
@@ -603,15 +609,17 @@ msgstr "Ограничение скорости, Кб/сек:"
 #: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
-"Ограничение скорости передачи файла в Кб/сек. (Установите в 0 для отключения)."
+"Ограничение скорости передачи файла в Кб/сек. (Установите в 0 для "
+"отключения)."
 
 #: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Размер блока передачи:"
 
 #: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "Размер блока используемый при предаче файлов. Должен быть кратен 1024."
 
@@ -764,7 +772,7 @@ msgstr "Локально"
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:274 src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Закладки"
 
@@ -772,35 +780,27 @@ msgstr "Закладки"
 msgid "FSP"
 msgstr "FSP"
 
-#: lib/protocols.c:234
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Передача файлов будет ограничена до скорости %.2f Кб/сек\n"
 
-#: lib/protocols.c:387
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Ошибка при установке LC_TIME в \"%s\". Произведён откат в \"%s\"\n"
 
-#: lib/protocols.c:398
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Загрузка списка файлов каталога %s из кэша (LC_TIME=%s)\n"
 
-#: lib/protocols.c:408
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Загрузка списка файлов каталога %s с сервера (LC_TIME=%s)\n"
 
-#: lib/protocols.c:471
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Ошибка преобразования строки \"%s\" из кодировки \"%s\" в кодировку \"%s\": %"
-"s\n"
-
-#: lib/protocols.c:696
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -809,108 +809,50 @@ msgstr ""
 "Предупреждение: удаляется часть пути до файла '%s'. Удалённая часть (%s) не "
 "совпадает с текущим каталогом (%s)\n"
 
-#: lib/protocols.c:722
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Ошибка: Невозможно записать в кэш: %s\n"
 
-#: lib/protocols.c:755
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Ошибка: Невозможно найти закладку %s\n"
 
-#: lib/protocols.c:762
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Ошибка закладок: В закладке \"%s\" нет названия сервера\n"
 
-#: lib/protocols.c:884 lib/protocols.c:911
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Протокол \"%s\" пока не поддерживается.\n"
 
-#: lib/protocols.c:1201 lib/protocols.c:1216 lib/protocols.c:2398
-#: lib/protocols.c:2511
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Поиск %s\n"
-
-#: lib/protocols.c:1207 lib/protocols.c:1222 lib/protocols.c:2403
-#: lib/protocols.c:2516
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Невозможно найти сервер с именем %s: %s\n"
-
-#: lib/protocols.c:2133
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Найдена рекурсивная символьная ссылка %s\n"
 
-#: lib/protocols.c:2421
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Сбой при создании сокета: %s\n"
-
-#: lib/protocols.c:2427 lib/protocols.c:2533
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Попытка %s:%d\n"
-
-#: lib/protocols.c:2432 lib/protocols.c:2540
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Невозможно подключиться к %s: %s\n"
-
-#: lib/protocols.c:2470 lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Сбой при создании сокета IPv4: %s\n"
-
-#: lib/protocols.c:2494 lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-"Невозможно найти сервис с названием %s/tcp. Пожалуйста, проверьте что у вас "
-"с файлом /etc/services\n"
-
-#: lib/protocols.c:2556 lib/protocols.c:3209 lib/rfc959.c:715 lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Ошибка: Невозможно установить close на флаг exec: %s\n"
-
-#: lib/protocols.c:2563
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Подключение к %s:%d\n"
-
-#: lib/protocols.c:2799 lib/protocols.c:2876 lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Тайм-аут соединения %s\n"
-
-#: lib/protocols.c:2946
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Невозможно получить флаги сокет: %s\n"
-
-#: lib/protocols.c:2960
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Невозможно установить неблокирующий режим для сокета: %s\n"
-
-#: lib/protocols.c:3106
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Ошибка: Удалённый сервер %s отключился. Достигнуто макс. число повторов..\n"
 
-#: lib/protocols.c:3114
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Ошибка: Удалённый сервер %s отключился. Повторное соединение будет выполнено "
 "через %d секунд\n"
 
+#: lib/protocols.c:1634 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 "Ошибка: Невозможно установить close на флаг exec: %s\n"
+
 #: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
@@ -1133,10 +1075,11 @@ msgid "Transfer files in ASCII mode"
 msgstr "Передать файлы в текстовом режиме"
 
 #: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1146,78 +1089,135 @@ msgstr ""
 "передаёте из UNIX в UNIX, тогда лучше снять отметку этого пункта. Если вы "
 "передаёте двоичные данные, вы обязательно должны отключить этот режим."
 
-#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:855
-#: lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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 "Невозможно найти адрес IP в ответе PASV '%s'\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 ""
 "Игнорируется адрес IP в ответе на запрос PASV, соединяемся с %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"
 
-#: 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:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "всего"
 
-#: lib/rfc959.c:1594
+#: 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. Пожалуйста, проверьте что у вас "
+"с файлом /etc/services\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"
@@ -1275,7 +1275,7 @@ msgstr "(да/нет) ?"
 msgid "Enter PASSCODE:"
 msgstr "Введите ПАРОЛЬ:"
 
-#: lib/sshv2.c:518 src/gtk/gtkui.c:142 src/gtk/transfer.c:562
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
 #: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Введите пароль"
@@ -1358,10 +1358,7 @@ msgstr "%d: Изменить права %s %o\n"
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:690 src/gtk/bookmarks.c:1042 src/gtk/bookmarks.c:1292
-#: src/gtk/chmod_dialog.c:253 src/gtk/gtkui_transfer.c:376
-#: src/gtk/misc-gtk.c:995 src/gtk/options_dialog.c:1205
-#: src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
@@ -1470,7 +1467,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 "
@@ -1479,31 +1476,31 @@ msgstr ""
 "ОШИБКА: Сервер в SSL-сертификате (%s) не совпадает с сервером, к которому мы "
 "подсоединяемся (%s). Отменяем соединение.\n"
 
-#: lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Невозможно инициализировать библиотеку OpenSSL\n"
 
-#: lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Ошибка при загрузке сертификатов SSL по умолчанию\n"
 
-#: lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Ошибка настройки списка cipher (нет верных ciphers)\n"
 
-#: lib/sslcommon.c:353 lib/sslcommon.c:427 lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Ошибка: ядро SSL не было инициализировано\n"
 
-#: lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Ошибка настройки SSL-соединения (объект BIO)\n"
 
-#: lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Ошибка настройки SSL-соединения (объект SSL)\n"
 
-#: lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Ошибка с сертификатом другой стороны: %s\n"
@@ -1517,17 +1514,7 @@ 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 ""
-">. Если у вас есть вопросы, комментарии или замечания по этой программе, вы "
-"можете написать мне об этом по эл. адресу. Вы можете также найти последние "
-"новости о gFTP на моём сайте по адресу http://www.gftp.org/\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 "
@@ -1537,74 +1524,75 @@ msgstr ""
 "COPYING. Это свободная программа, вы можете распространять ее на условиях, "
 "описанных в файле COPYING\n"
 
-#: src/uicommon/gftpui.c:160 src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
-msgstr "Перевод сделал Валёк Филиппов, дополнили Виталий Липатов и Александр Орлов"
+msgstr ""
+"Перевод сделал Валёк Филиппов, дополнили Виталий Липатов и Александр Орлов"
 
-#: 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 <режим> <файл>\n"
 
-#: src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "использование: rename <старое название> <новое название>\n"
 
-#: src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "использование: delete <файл>\n"
 
-#: src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "использование: rmdir <каталог>\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 <новый каталог>\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 <каталог>\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"
 
-#: 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 [переменная = значение]\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"
 
-#: 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"
@@ -1887,22 +1875,22 @@ msgstr "Пропускаем файл %s на сервере %s\n"
 msgid "Stopping the transfer on host %s\n"
 msgstr "Остановка передачи на сервер %s\n"
 
-#: src/uicommon/gftpui.c:1502
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Невозможно выкачать %s c %s\n"
 
-#: src/uicommon/gftpui.c:1558
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"%d файл(ов) или каталог(ов) не могут быть переданы. Проверьте журнал "
-"чтобы узнать, какие элементы не были переданы."
+"%d файл(ов) или каталог(ов) не могут быть переданы. Проверьте журнал чтобы "
+"узнать, какие элементы не были переданы."
 
-#: 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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
@@ -1945,27 +1933,27 @@ msgstr ""
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
-#: src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Вам необходимо указать название для закладки."
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Новая папка"
 
-#: src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Введите название для создаваемой папки"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Новый элемент"
 
-#: src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Введите название создаваемого элемента"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1974,106 +1962,99 @@ msgstr ""
 "Вы действительно хотите удалить закладку\n"
 "%s и всё её содержимое?"
 
-#: src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Удалить закладку"
 
-#: src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: src/gtk/bookmarks.c:849 src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Редактирование записи"
 
-#: src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Название сервера:"
 
-#: src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Удалённый каталог:"
 
-#: src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Локальный каталог:"
 
-#: src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/gtk/bookmarks.c:1000 src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Учётная запись:"
 
-#: src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as 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
-#: src/gtk/options_dialog.c:1216 src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Отменить  "
-
-#: src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Файл/tearoff"
 
-#: src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Файл/Новая _папка..."
 
-#: src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Файл/Новый _элемент..."
 
-#: src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Файл/_Удалить"
 
-#: src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Файл/_Свойства..."
 
-#: src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Файл/sep"
 
-#: src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Файл/_Закрыть"
 
-#: src/gtk/bookmarks.c:1229 src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Редактирование закладок"
 
-#: src/gtk/chmod_dialog.c:132 src/gtk/chmod_dialog.c:137
-#: src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Сменить права"
 
-#: src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2081,46 +2062,46 @@ msgstr ""
 "Вы можете настроить права для ваших файлов\n"
 "Внимание: эта возможность поддерживается не всеми FTP-серверами"
 
-#: src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Специальные"
 
-#: src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/gtk/chmod_dialog.c:192 src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Пользователь"
 
-#: src/gtk/chmod_dialog.c:200 src/gtk/chmod_dialog.c:220
-#: src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Чтение"
 
-#: src/gtk/chmod_dialog.c:204 src/gtk/chmod_dialog.c:224
-#: src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Запись"
 
-#: src/gtk/chmod_dialog.c:208 src/gtk/chmod_dialog.c:228
-#: src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Выполнение"
 
-#: src/gtk/chmod_dialog.c:212 src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Группа"
 
-#: src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Остальные"
 
@@ -2143,12 +2124,11 @@ msgstr "Вы уверены, что хотите удалить эти %ld ка
 msgid "Delete Files/Directories"
 msgstr "Удаление файлов/каталогов"
 
-#: src/gtk/delete_dialog.c:90 src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1097 src/gtk/misc-gtk.c:929
-#: src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Соединить"
 
@@ -2161,11 +2141,11 @@ msgstr "Получен URL %s\n"
 msgid "Drag-N-Drop"
 msgstr "Перетаскивание-Вставка"
 
-#: src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Выйти"
 
-#: src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2173,371 +2153,363 @@ msgstr ""
 "В данный момент происходит передача файлов.\n"
 "Вы уверены в том, что хотите выйти?"
 
-#: src/gtk/gftp-gtk.c:219 src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Открыть адрес"
 
-#: src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Введите URL, к которому надо подключиться:"
 
-#: src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Окно _1"
 
-#: src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Окно _2"
 
-#: src/gtk/gftp-gtk.c:271 src/gtk/gftp-gtk.c:276 src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Текстовые данные"
 
-#: src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Двоичные данные"
 
-#: src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/Файл/_Свойства..."
 
-#: src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Выйти"
 
-#: src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Локально"
 
-#: src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Локально/tearoff"
 
-#: src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Локально/_Открыть адрес..."
 
-#: src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Локально/О_тсоединиться"
 
-#: src/gtk/gftp-gtk.c:286 src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Локально/sep"
 
-#: src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Локально/Изменить _фильтр отбора файлов..."
 
-#: src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Локально/_Показать выделенное"
 
-#: src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Локально/Выделить _всё"
 
-#: src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Локально/Выделить все файлы"
 
-#: src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Локально/Снять выделение"
 
-#: src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Локально/Сохранить перечень файлов"
 
-#: src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Локально/Послать команду SITE"
 
-#: src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Локально/Изменить _каталог"
 
-#: src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Локально/Изменить _права"
 
-#: src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Локально/_Новая папка"
 
-#: src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Локально/Пере_именовать"
 
-#: src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Локально/_Удалить"
 
-#: src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Локально/_Редактировать"
 
-#: src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Локально/_Просмотреть"
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Локально/_Обновить"
 
-#: src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Удалённо"
 
-#: src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Удалённо/tearoff"
 
-#: src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Удалённо/_Открыть адрес..."
 
-#: src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Удалённо/О_тсоединиться"
 
-#: src/gtk/gftp-gtk.c:314 src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Удалённо/sep"
 
-#: src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Удалённо/Изменить _фильтр отбора файлов"
 
-#: src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Удалённо/_Показать выделенное"
 
-#: src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Удалённо/Выделить _всё"
 
-#: src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Удалённо/Выделить все файлы"
 
-#: src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Удалённо/Снять выделение"
 
-#: src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Удалённо/Сохранить перечень файлов"
 
-#: src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Удалённо/Послать команду SITE"
 
-#: src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Удалённо/Изменить _каталог"
 
-#: src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Удалённо/Изменить _права"
 
-#: src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Удалённо/_Новая папка"
 
-#: src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Удалённо/Пере_именовать"
 
-#: src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Удалённо/_Удалить"
 
-#: src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Удалённо/_Редактировать"
 
-#: src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Удалённо/_Просмотреть"
 
-#: src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Удалённо/_Обновить"
 
-#: src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/Закладки"
 
-#: src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Закладки/tearoff"
 
-#: src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Закладки/Добавить _закладку"
 
-#: src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Закладки/Редактировать закладки"
 
-#: src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Закладки/sep"
 
-#: src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Передача"
 
-#: src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Передача/tearoff"
 
-#: src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Передача/_Начать"
 
-#: src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Передача/_Остановить"
 
-#: src/gtk/gftp-gtk.c:346 src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Передача/sep"
 
-#: src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Передача/Пропустить _текущий файл"
 
-#: src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Передача/_Удалить файл"
 
-#: src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Передача/Переместить файл в_верх"
 
-#: src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Передача/Переместить файл в_низ"
 
-#: src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Передача/_Получить файлы"
 
-#: src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Передача/_Выложить файлы"
 
-#: src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/_Журнал"
 
-#: src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Журнал/tearoff"
 
-#: src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Журнал/_Очистить"
 
-#: src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Журнал/_Просмотреть"
 
-#: src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Журнал/_Сохранить"
 
-#: src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Инструменты"
 
-#: src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Инструменты/tearoff"
 
-#: src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Инструменты/_Сравнить окна"
 
-#: src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Инструменты/_Очистить кэш"
 
-#: src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Справка"
 
-#: src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Справка/tearoff"
 
-#: src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Справка/_О программе..."
 
-#: src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Сервер: "
-
-#: src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Сервер: "
 
-#: src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порт: "
 
-#: src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Пользователь: "
-
-#: src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Пользователь: "
 
-#: src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Пароль: "
 
-#: src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Команда: "
 
-#: src/gtk/gftp-gtk.c:778 src/gtk/gftp-gtk.c:989 src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Название файла"
 
-#: src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Размер"
 
-#: src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Дата"
 
-#: src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Атрибуты"
 
-#: src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Ход работы"
 
-#: src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Ошибка: вы должны указать сервер для подключения\n"
 
@@ -2553,49 +2525,48 @@ msgstr "Имя пользователя:"
 msgid "Please enter your username for this site"
 msgstr "Введите ваше имя пользователя для этого сервера:"
 
-#: src/gtk/gtkui.c:143 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Введите ваш пароль для этого сервера:"
 
-#: src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Действие отменено... вы должны ввести строку\n"
 
-#: src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Создать каталог"
 
-#: src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Создать каталог"
 
-#: src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Введите название для создаваемого каталога:"
 
-#: src/gtk/gtkui.c:370 src/gtk/gtkui.c:382 src/gtk/misc-gtk.c:932
-#: src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Во что бы вы хотели переименовать %s?"
 
-#: src/gtk/gtkui.c:402 src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Сервер"
 
-#: src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Введите специфичную для сервера команду:"
 
-#: src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Добавить к SITE"
 
-#: src/gtk/gtkui.c:449 src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Изменить каталог"
 
@@ -2608,30 +2579,29 @@ msgstr "Пропущено"
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:314
-#: src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Переписать"
 
-#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:320
-#: src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Продолжить"
 
-#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Пропустить"
 
-#: src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Действие"
 
-#: src/gtk/gtkui_transfer.c:236 src/gtk/gtkui_transfer.c:245
-#: src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Передать файлы"
 
-#: src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2639,19 +2609,19 @@ msgstr ""
 "Следующие файлы существуют и на локальном и на удалённом компьютере\n"
 "Пожалуйста выберите, что вы хотите сделать"
 
-#: src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Пропустить файл"
 
-#: src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Выделить всё"
 
-#: src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Снять выделение"
 
@@ -2669,7 +2639,7 @@ msgstr "Изменить фильтр отбора файлов"
 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/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
 #: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
@@ -2679,21 +2649,21 @@ msgstr "Ошибка: Невозможно открыть %s для записи
 msgid "Save Directory Listing"
 msgstr "Сохранить перечень файлов в каталоге"
 
-#: src/gtk/menu-items.c:327 src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Ошибка: Ошибка записи в %s: %s\n"
 
-#: src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Файл журнала успешно записан в %s\n"
 
-#: src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Сохранить журнал"
 
-#: src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2702,11 +2672,11 @@ msgstr ""
 "Невозможно найти файл лицензионного соглашения COPYING. Пожалуйста, "
 "убедитесь, что он либо в %s либо в %s"
 
-#: src/gtk/menu-items.c:454 src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "О программе gFTP"
 
-#: src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2717,27 +2687,23 @@ msgstr ""
 "Авторские права (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Официальный сайт проекта: http://www.gftp.org/\n";
 
-#: src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "О программе"
 
-#: src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Лицензионное соглашение"
 
-#: src/gtk/menu-items.c:558 src/gtk/view_dialog.c:364
-msgid "  Close  "
-msgstr "  Закрыть  "
-
-#: src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Сравнить окна"
 
-#: src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Отсоединиться от удалённого сервера"
 
-#: src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2745,72 +2711,56 @@ msgstr ""
 "Присоединиться к узлу заданным в поле ввода. Если поле ввода будет пустым, "
 "появится диалог, который запросит URL."
 
-#: src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Все файлы"
 
-#: src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Кэшировано) ["
 
-#: src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Нет подключения"
 
-#: src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Ошибка при открытии файла %s: %s\n"
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Не подключен к удалённому серверу\n"
 
-#: src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Эта возможность недоступна при использовании этого протокола\n"
 
-#: src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Вы должны выбрать только один элемент\n"
 
-#: src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: У вас должен быть выбран хотя бы один элемент\n"
 
-#: src/gtk/misc-gtk.c:926 src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Изменить"
 
-#: src/gtk/misc-gtk.c:998 src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Добавить"
-
-#: src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Отменить"
-
-#: src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Да  "
-
-#: src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Нет  "
-
-#: src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Получение списка файлов каталога"
 
-#: src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Остановить  "
 
-#: src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2819,71 +2769,51 @@ msgstr ""
 "Получено %ld каталогов\n"
 "и %ld файлов"
 
-#: src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Ошибка gFTP: Невозможно найти файл %s в %s или %s\n"
 
-#: src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Редактирование сервера"
 
-#: src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Добавить сервер"
 
-#: src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Тип:"
-
-#: src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "Тип:"
 
-#: src/gtk/options_dialog.c:1014 src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Домен"
 
-#: src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Сетевой адрес"
-
-#: src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "Сетевой адрес:"
 
-#: src/gtk/options_dialog.c:1088 src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Маска сети"
-
-#: src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Маска сети:"
 
-#: src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "Домен:"
 
-#: src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Маска сети"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Локальные серверы"
 
-#: src/gtk/options_dialog.c:1288 src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Правка"
-
-#: src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "Правка"
-
-#: src/gtk/options_dialog.c:1367 src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Параметры"
 
-#: src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Применить"
-
 #: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Получение названий файлов..."
@@ -2942,15 +2872,15 @@ msgstr "Завершено"
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
-"Передано %s из %s со скоростью %.2fКб/сек, ожидаемое время завершения: %02d:%"
-"02d:%02d"
+"Передано %s из %s со скоростью %.2fКб/сек, ожидаемое время завершения: %02d:"
+"%02d:%02d"
 
 #: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
-"Получено %s из %s со скоростью %.2fКб/сек, ожидаемое время завершения: %02d:%"
-"02d:%02d "
+"Получено %s из %s со скоростью %.2fКб/сек, ожидаемое время завершения: %02d:"
+"%02d:%02d "
 
 #: src/gtk/transfer.c:750
 #, c-format
@@ -2973,8 +2903,8 @@ msgstr "Неизвестный процент до завершения. (Фай
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
-"Выполнено %d%%, ожидаемое время до завершения: %02d:%02d:%02d. (Файл %ld из %"
-"ld) "
+"Выполнено %d%%, ожидаемое время до завершения: %02d:%02d:%02d. (Файл %ld из "
+"%ld) "
 
 #: src/gtk/transfer.c:842
 #, c-format
@@ -2990,6 +2920,10 @@ msgstr "Не выбраны передаваемые файлы\n"
 msgid "View"
 msgstr "Просмотр"
 
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Правка"
+
 #: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
@@ -3004,27 +2938,27 @@ msgstr "Редактирование: %s -- это каталог. Его нев
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Редактирование: Вы должны указать редактор в диалоге параметров\n"
 
-#: src/gtk/view_dialog.c:169
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Просмотр: Невозможно порождение другого процесса: %s\n"
 
-#: src/gtk/view_dialog.c:172
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Запуск программы: %s %s\n"
 
-#: src/gtk/view_dialog.c:231
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Открытие %s с помощью %s\n"
 
-#: src/gtk/view_dialog.c:266
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Просмотр файла %s\n"
 
-#: src/gtk/view_dialog.c:273
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Просмотр: Невозможно открыть файл %s: %s\n"
@@ -3042,10 +2976,57 @@ msgstr "Имя пользователя [anonymous]:"
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s уже существует. (%s исходный размер, %s размер получателя):\n"
 "(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 ""
+#~ ">. Если у вас есть вопросы, комментарии или замечания по этой программе, "
+#~ "вы можете написать мне об этом по эл. адресу. Вы можете также найти "
+#~ "последние новости о gFTP на моём сайте по адресу http://www.gftp.org/\n";
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Отменить  "
+
+#~ msgid "Host: "
+#~ msgstr "Сервер: "
+
+#~ msgid "User: "
+#~ msgstr "Пользователь: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Закрыть  "
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Cancel"
+#~ msgstr "Отменить"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Да  "
+
+#~ msgid "  No  "
+#~ msgstr "  Нет  "
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Network Address"
+#~ msgstr "Сетевой адрес"
+
+#~ msgid "_Edit"
+#~ msgstr "Правка"
+
+#~ msgid "Apply"
+#~ msgstr "Применить"
diff --git a/po/rw.po b/po/rw.po
index 118352a..8711e91 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -14,11 +14,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-01 12:20-0700\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
+"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,40 +35,48 @@ msgstr ""
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Umurongo in Ubwihisho Umubarendanga"
 
-#: lib/cache.c:137 lib/fsp.c:537 lib/local.c:477
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, fuzzy, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "OYA Ubwoko bushyinguro"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, fuzzy, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Kurema By'igihe gito IDOSIYE"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:157 lib/config_file.c:163
-#: lib/local.c:102 lib/local.c:217 lib/rfc2068.c:259 lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, fuzzy, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "IDOSIYE"
 
-#: lib/cache.c:250 lib/fsp.c:128 lib/fsp.c:208 lib/local.c:136 lib/local.c:145
-#: lib/local.c:192
+#: lib/cache.c:254 lib/fsp.c:127 lib/fsp.c:207 lib/local.c:184 lib/local.c:193
+#: lib/local.c:247
 #, fuzzy, c-format
 msgid "Error: Cannot seek on file %s: %s\n"
 msgstr "ku IDOSIYE"
 
-#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:3000
+#: lib/charset-conv.c:71
+#, fuzzy, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Guhindura.... Ikurikiranyanyuguti Bivuye Inyuguti Gushyiraho Kuri Inyuguti "
+"Gushyiraho"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, fuzzy, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Gufungura IDOSIYE"
 
-#: lib/config_file.c:143 lib/protocols.c:2707 lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, fuzzy, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "OYA Kwandika Kuri"
 
-#: lib/config_file.c:151 lib/protocols.c:2631 lib/sshv2.c:364
-#: lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, fuzzy, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "OYA Gusoma Bivuye"
@@ -97,7 +106,7 @@ msgstr "Umurongo in Ibirango IDOSIYE"
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr ""
 
-#: lib/config_file.c:505
+#: lib/config_file.c:504
 #, fuzzy
 msgid ""
 "This section specifies which hosts are on the local subnet and won't need to "
@@ -107,7 +116,7 @@ msgstr ""
 "Icyiciro ku i Na Kuri Gyayo Inyuma i Porogisi Seriveri NIBA Bihari Urwego "
 "Cyangwa urusobe Umubare"
 
-#: lib/config_file.c:508
+#: lib/config_file.c:507
 #, fuzzy
 msgid ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
@@ -164,7 +173,7 @@ msgstr "Gufungura kugirango"
 #: lib/config_file.c:732
 #, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 "org."
 
@@ -182,13 +191,13 @@ msgstr ""
 #: lib/config_file.c:845
 #, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 "org."
 
-#: lib/config_file.c:1209 lib/protocols.c:383 lib/protocols.c:455
-#: lib/protocols.c:526 lib/rfc2068.c:545 lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 #, fuzzy
 msgid "<unknown>"
 msgstr "<Itazwi>"
@@ -199,82 +208,83 @@ msgstr "<Itazwi>"
 msgid "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 msgstr "Ihitamo OYA Byabonetse in"
 
-#: lib/fsp.c:190
+#: lib/fsp.c:189
 #, fuzzy, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "IDOSIYE"
 
-#: lib/fsp.c:200
+#: lib/fsp.c:199
 #, fuzzy, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Kwandika Kuri IDOSIYE"
 
-#: lib/fsp.c:238
+#: lib/fsp.c:237
 #, fuzzy, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "IDOSIYE"
 
-#: lib/fsp.c:326
+#: lib/fsp.c:327
 #, fuzzy, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "IDOSIYE Bivuye Seriveri"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.STR_UNKNOWNSIZE.text
-#: lib/fsp.c:338 lib/fsp.c:339 lib/protocols.c:1541 lib/protocols.c:1542
-#: lib/protocols.c:1583 lib/protocols.c:1584 lib/protocols.c:1647
-#: lib/protocols.c:1654 lib/protocols.c:1730 lib/protocols.c:1731
-#: lib/protocols.c:1767
+#: 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 "ntibizwi"
 
-#: lib/fsp.c:376
+#: lib/fsp.c:377
 #, fuzzy, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "OYA Kubona bushyinguro"
 
-#: lib/fsp.c:438
+#: lib/fsp.c:436
 #, fuzzy, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Byahinduwe bushyinguro Kuri"
 
-#: lib/fsp.c:448
+#: lib/fsp.c:446
 #, fuzzy, c-format
 msgid "Could not change directory to %s\n"
 msgstr "OYA Guhindura>> bushyinguro Kuri"
 
-#: lib/fsp.c:473 lib/fsp.c:502 lib/local.c:424 lib/local.c:447
-#: src/gtk/transfer.c:260 src/gtk/view_dialog.c:328
+#: 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:304
 #, fuzzy, c-format
 msgid "Successfully removed %s\n"
 msgstr "Cyavanyweho"
 
-#: lib/fsp.c:479 lib/local.c:430
+#: lib/fsp.c:477 lib/local.c:486
 #, fuzzy, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "OYA Gukuraho... bushyinguro"
 
-#: lib/fsp.c:508 lib/local.c:453 src/gtk/transfer.c:264
-#: src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, fuzzy, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "OYA Gukuraho... IDOSIYE"
 
-#: lib/fsp.c:530 lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, fuzzy, c-format
 msgid "Successfully made directory %s\n"
 msgstr "bushyinguro"
 
-#: lib/fsp.c:565 lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, fuzzy, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Kuri"
 
-#: lib/fsp.c:577 lib/local.c:503
+#: lib/fsp.c:575 lib/local.c:597
 #, fuzzy, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "OYA Guhindura izina Kuri"
 
-#: lib/ftps.c:157
+#: lib/ftps.c:156
 #, fuzzy
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
@@ -288,73 +298,78 @@ msgid ""
 "connection.\n"
 msgstr "guhera Gushigikira OYA in Ukwihuza"
 
-#: lib/local.c:71 lib/local.c:407
-#, fuzzy, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "OYA Guhindura>> bushyinguro Kuri"
-
-#: lib/local.c:85 lib/local.c:392
+#: lib/local.c:66
 #, fuzzy, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "OYA Kubona KIGEZWEHO bushyinguro"
 
-#: lib/local.c:183
+#: lib/local.c:105
+#, fuzzy, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Byahinduwe bushyinguro Kuri"
+
+#: lib/local.c:112
+#, fuzzy, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "OYA Guhindura>> bushyinguro Kuri"
+
+#: lib/local.c:238
 #, fuzzy, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "IDOSIYE"
 
-#: lib/local.c:347
+#: lib/local.c:424
 #, fuzzy, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "OYA Kubona bushyinguro"
 
-#: lib/local.c:384
-#, fuzzy, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Byahinduwe bushyinguro Kuri"
-
-#: lib/local.c:520
+#: lib/local.c:634
 #, fuzzy, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Byahinduwe Ubwoko Bya Kuri"
 
-#: lib/local.c:527
+#: lib/local.c:641
 #, fuzzy, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "OYA Guhindura>> Ubwoko Bya Kuri"
 
-#: lib/local.c:623
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Byahinduwe bushyinguro Kuri"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "OYA Guhindura>> Ubwoko Bya Kuri"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr ""
 
-#: lib/misc.c:401
+#: lib/misc.c:414
 #, fuzzy, c-format
 msgid "usage: gftp "
 msgstr "Ikoresha:"
 
-#: lib/misc.c:401 lib/rfc2068.c:303 src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr ""
-
 # svx/source\items\svxitems.src:RID_SVXITEMS_EMPHASIS_NONE_STYLE.text
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ntacyo"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_HFCMD_FILE.text
-#: lib/options.h:24
+#: lib/options.h:25
 #, fuzzy
 msgid "file"
 msgstr "IDOSIYE"
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_CONFIDENCE.6.text
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "ingano"
 
 # sc/source\ui\dbgui\dapitype.src:RID_SCDLG_DAPISERVICE.FT_USER.text
-#: lib/options.h:25
+#: lib/options.h:26
 #, fuzzy
 msgid "user"
 msgstr "Umukoresha"
@@ -363,7 +378,7 @@ msgstr "Umukoresha"
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MAKEOUTLINE.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_GROUP.text
-#: lib/options.h:25
+#: lib/options.h:27
 #, fuzzy
 msgid "group"
 msgstr "Itsinda"
@@ -372,26 +387,26 @@ msgstr "Itsinda"
 # sc/source\ui\formdlg\dwfunctr.src:FID_FUNCTION_BOX.CB_CAT.4.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\formdlg\formdlgs.src:RID_SCTAB_FUNCTION.LB_CATEGORY.4.text
-#: lib/options.h:26
+#: lib/options.h:28
 #, fuzzy
 msgid "datetime"
 msgstr "ItarikiIgihe"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "ubujyesi"
 
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ubujyejuru"
 
@@ -404,16 +419,16 @@ msgstr "ubujyejuru"
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Rusange"
 
-#: lib/options.h:37
+#: lib/options.h:43
 #, fuzzy
 msgid "View program:"
 msgstr "Porogaramu"
 
-#: lib/options.h:38
+#: lib/options.h:44
 #, fuzzy
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
@@ -422,39 +437,30 @@ msgstr ""
 "Mburabuzi Porogaramu Kuri Kureba Idosiye iyi ni Ahatanditseho i By'imbere "
 "IDOSIYE"
 
-#: lib/options.h:40
+#: lib/options.h:46
 #, fuzzy
 msgid "Edit program:"
 msgstr "Porogaramu"
 
-#: lib/options.h:41
+#: lib/options.h:47
 #, fuzzy
 msgid "The default program used to edit files."
 msgstr "Mburabuzi Porogaramu Kuri Guhindura Idosiye"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr ""
-
-#: lib/options.h:44
-#, fuzzy
-msgid "The default directory gFTP will go to on startup"
-msgstr "Mburabuzi bushyinguro Gyayo Kuri ku"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr ""
 
-#: lib/options.h:47
+#: lib/options.h:50
 #, fuzzy
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Kinini Ingano Bya i LOG Idirishya in Bayite kugirango i Umuyoboro"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 #, fuzzy
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
@@ -463,150 +469,169 @@ msgstr ""
 "ni a Akitso Urutonde Bya Kuri Kuri GUHINDURA i Ubutumwa Kuri i KIGEZWEHO "
 "Umwanya"
 
-#: lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr ""
 
-#: lib/options.h:55
+#: lib/options.h:58
 #, fuzzy
 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 "ni i Agaciro Bya kugirango i Ipaji ni Amatariki in i bushyinguro"
 
-#: lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:60
+#: lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Umubare Bya amasogonda Kuri Gumana: Ubwihisho Ibyinjijwe Mbere"
 
-#: lib/options.h:63
+#: lib/options.h:66
 #, fuzzy
 msgid "Append file transfers"
 msgstr "IDOSIYE"
 
-#: lib/options.h:65
+#: lib/options.h:68
 #, fuzzy
 msgid "Append new file transfers onto existing ones"
 msgstr "Gishya IDOSIYE"
 
-#: lib/options.h:66
+#: lib/options.h:69
 #, fuzzy
 msgid "Do one transfer at a time"
 msgstr "ku a Igihe"
 
-#: lib/options.h:68
+#: lib/options.h:71
 #, fuzzy
 msgid "Do only one transfer at a time?"
 msgstr "ku a Igihe"
 
-#: lib/options.h:69
+#: lib/options.h:72
 #, fuzzy
 msgid "Overwrite by Default"
 msgstr "Gusimbuza ku"
 
-#: lib/options.h:72
+#: lib/options.h:75
 #, fuzzy
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Gusimbuza Idosiye ku Mburabuzi Cyangwa Gushyiraho Kuri Gusubiramo IDOSIYE"
 
-#: lib/options.h:74
+#: lib/options.h:77
 #, fuzzy
 msgid "Preserve file permissions"
 msgstr "IDOSIYE Uruhushya"
 
-#: lib/options.h:77
+#: lib/options.h:80
 #, fuzzy
-msgid "Preserve file permissions of transfered files"
+msgid "Preserve file permissions of transferred files"
 msgstr "IDOSIYE Uruhushya Bya Idosiye"
 
-#: lib/options.h:79
+#: lib/options.h:82
 #, fuzzy
 msgid "Preserve file time"
 msgstr "IDOSIYE Igihe"
 
-#: lib/options.h:82
+#: lib/options.h:85
 #, fuzzy
-msgid "Preserve file times of transfered files"
+msgid "Preserve file times of transferred files"
 msgstr "IDOSIYE Times Bya Idosiye"
 
-#: lib/options.h:84
+#: lib/options.h:87
 #, fuzzy
 msgid "Refresh after each file transfer"
 msgstr "Nyuma IDOSIYE"
 
-#: lib/options.h:87
+#: lib/options.h:90
 #, fuzzy
-msgid "Refresh the listbox after each file is transfered"
+msgid "Refresh the listbox after each file is transferred"
 msgstr "i Nyuma IDOSIYE ni"
 
-#: lib/options.h:89
+#: lib/options.h:92
 #, fuzzy
 msgid "Sort directories first"
 msgstr "ububiko bw'amaderese Itangira"
 
-#: lib/options.h:92
+#: lib/options.h:95
 #, fuzzy
 msgid "Put the directories first then the files"
 msgstr "i ububiko bw'amaderese Itangira Hanyuma i Idosiye"
 
-#: lib/options.h:93
+#: lib/options.h:96
 #, fuzzy
 msgid "Show hidden files"
 msgstr "gihishwe Idosiye"
 
-#: lib/options.h:96
+#: lib/options.h:99
 #, fuzzy
 msgid "Show hidden files in the listboxes"
 msgstr "gihishwe Idosiye in i"
 
-#: lib/options.h:97
+#: lib/options.h:100
 #, fuzzy
 msgid "Show transfer status in title"
 msgstr "Imimerere in Umutwe"
 
-#: lib/options.h:99
+#: lib/options.h:102
 #, fuzzy
 msgid "Show the file transfer status in the titlebar"
 msgstr "i IDOSIYE Imimerere in i"
 
-#: lib/options.h:100
+#: lib/options.h:103
 #, fuzzy
 msgid "Start file transfers"
 msgstr "Gutangira IDOSIYE"
 
-#: lib/options.h:102
+#: lib/options.h:105
 #, fuzzy
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Gutangira i IDOSIYE Ryari: Kubona Yashizwe ku murongo"
 
-#: lib/options.h:104
+#: lib/options.h:107
 #, fuzzy
 msgid "Allow manual commands in GUI"
 msgstr "Bikorwa Amabwiriza in"
 
-#: lib/options.h:106
+#: lib/options.h:109
 #, fuzzy
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "Bikorwa Amabwiriza in i Imimaro nka i Umwandiko Umuyoboro"
 
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "a bushyinguro"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Bivuye i Seriveri"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
 # 4032
-#: lib/options.h:108 src/gtk/options_dialog.c:1023
-#: src/gtk/options_dialog.c:1243
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "urusobe"
 
-#: lib/options.h:110
+#: lib/options.h:122
 #, fuzzy
 msgid "Network timeout:"
 msgstr "Igihe cyarenze:"
 
-#: lib/options.h:113
+#: lib/options.h:125
 #, fuzzy
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
@@ -614,63 +639,63 @@ msgstr ""
 "Igihe cyarenze: Tegereza kugirango urusobe Iyinjiza Ibisohoka ni Igihe "
 "cyarenze:"
 
-#: lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr ""
 
-#: lib/options.h:118
+#: lib/options.h:130
 #, fuzzy
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Umubare Bya Ikiyega Kuri iyi Kuri 0 Kuri Ongera ugerageze Kidasobanutse."
 
-#: lib/options.h:120
+#: lib/options.h:132
 #, fuzzy
 msgid "Retry sleep time:"
 msgstr "Wongereugerageze Igihe"
 
-#: lib/options.h:123
+#: lib/options.h:135
 #, fuzzy
 msgid "The number of seconds to wait between retries"
 msgstr "Umubare Bya amasogonda Kuri Tegereza hagati"
 
-#: lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr ""
 
-#: lib/options.h:127
+#: lib/options.h:139
 #, fuzzy
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Kinini S a IDOSIYE Kubona Kuri 0 Kuri"
 
-#: lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr ""
 
-#: lib/options.h:132
+#: lib/options.h:144
 #, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "Funga Ingano ni Ryari: Idosiye a Igikubo Bya"
 
 # 1507
-#: lib/options.h:135
+#: lib/options.h:147
 #, fuzzy
 msgid "Default Protocol:"
 msgstr "Mburabuzi"
 
-#: lib/options.h:137
+#: lib/options.h:149
 #, fuzzy
 msgid "This specifies the default protocol to use"
 msgstr "i Mburabuzi Porotokole Kuri Gukoresha"
 
-#: lib/options.h:139 lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 #, fuzzy
 msgid "Enable IPv6 support"
 msgstr "Gushigikira"
 
-#: lib/options.h:147
+#: lib/options.h:159
 #, fuzzy
 msgid ""
 "This defines what will happen when you double click a file in the file "
@@ -679,32 +704,32 @@ msgstr ""
 "Ryari: MAHARAKUBIRI Kanda a IDOSIYE in i IDOSIYE 0 IDOSIYE 1. IDOSIYE 2. "
 "IDOSIYE"
 
-#: lib/options.h:150
+#: lib/options.h:162
 #, fuzzy
 msgid "The default width of the local files listbox"
 msgstr "Mburabuzi Ubugari Bya i Idosiye"
 
-#: lib/options.h:153
+#: lib/options.h:165
 #, fuzzy
 msgid "The default width of the remote files listbox"
 msgstr "Mburabuzi Ubugari Bya i Idosiye"
 
-#: lib/options.h:156
+#: lib/options.h:168
 #, fuzzy
 msgid "The default height of the local/remote files listboxes"
 msgstr "Mburabuzi Ubuhagarike Bya i Idosiye"
 
-#: lib/options.h:159
+#: lib/options.h:171
 #, fuzzy
 msgid "The default height of the transfer listbox"
 msgstr "Mburabuzi Ubuhagarike Bya i"
 
-#: lib/options.h:162
+#: lib/options.h:174
 #, fuzzy
 msgid "The default height of the logging window"
 msgstr "Mburabuzi Ubuhagarike Bya i Idirishya"
 
-#: lib/options.h:165
+#: lib/options.h:177
 #, fuzzy
 msgid ""
 "The width of the filename column in the transfer window. Set this to 0 to "
@@ -713,17 +738,17 @@ msgstr ""
 "Ubugari Bya i Izina ry'idosiye: Inkingi in i Idirishya iyi Kuri 0 Kuri iyi "
 "Inkingi Ihindurangero"
 
-#: lib/options.h:173 lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 #, fuzzy
 msgid "The default column to sort by"
 msgstr "Mburabuzi Inkingi Kuri Ishungura ku"
 
-#: lib/options.h:176 lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 #, fuzzy
 msgid "Sort ascending or descending"
 msgstr "Ubujyejuru Cyangwa Ubujyesi"
 
-#: lib/options.h:186 lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 #, fuzzy
 msgid ""
 "The width of the filename column in the file listboxes. Set this to 0 to "
@@ -732,7 +757,7 @@ msgstr ""
 "Ubugari Bya i Izina ry'idosiye: Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi "
 "Inkingi Ihindurangero iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:189 lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 #, fuzzy
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
@@ -741,7 +766,7 @@ msgstr ""
 "Ubugari Bya i Ingano Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi Inkingi "
 "Ihindurangero iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:192 lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 #, fuzzy
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
@@ -750,7 +775,7 @@ msgstr ""
 "Ubugari Bya i Ukoresha: Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi Inkingi "
 "Ihindurangero iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:195 lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 #, fuzzy
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
@@ -759,7 +784,7 @@ msgstr ""
 "Ubugari Bya i Itsinda Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi Inkingi "
 "Ihindurangero iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:198 lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 #, fuzzy
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
@@ -768,7 +793,7 @@ msgstr ""
 "Ubugari Bya i Itariki Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi Inkingi "
 "Ihindurangero iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:201 lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 #, fuzzy
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
@@ -777,65 +802,65 @@ msgstr ""
 "Ubugari Bya i Inkingi in i IDOSIYE iyi Kuri 0 Kuri iyi Inkingi Ihindurangero "
 "iyi Kuri 1. Kuri iyi Inkingi"
 
-#: lib/options.h:222
+#: lib/options.h:239
 #, fuzzy
 msgid "The color of the commands that are sent to the server"
 msgstr "Ibara Bya i Amabwiriza Yoherejwe: Kuri i Seriveri"
 
-#: lib/options.h:225
+#: lib/options.h:242
 #, fuzzy
 msgid "The color of the commands that are received from the server"
 msgstr "Ibara Bya i Amabwiriza BYAKIRIWE Bivuye i Seriveri"
 
-#: lib/options.h:228
+#: lib/options.h:245
 #, fuzzy
 msgid "The color of the error messages"
 msgstr "Ibara Bya i Ikosa Ubutumwa"
 
-#: lib/options.h:231
+#: lib/options.h:248
 #, fuzzy
 msgid "The color of the rest of the log messages"
 msgstr "Ibara Bya i Bya i LOG Ubutumwa"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_HELPERPROG.FT_FTP.text
-#: lib/options.h:237 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 #, fuzzy
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:240 lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr ""
 
 # svtools/source\misc\mediatyp.src:STR_SVT_MIMETYPE_CNT_HTTPBOX.text
-#: lib/options.h:245 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_HELPERPROG.FT_HTTPS.text
-#: lib/options.h:248 lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 #, fuzzy
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr ""
 
-#: lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
 # sfx2/sdi\sfxslots.src:SID_TOPDOC.text
-#: lib/options.h:257 src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Akamenyetso"
 
-#: lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr ""
 
-#: lib/protocols.c:225
+#: lib/protocols.c:226
 #, fuzzy, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Idosiye Kuri"
@@ -855,144 +880,70 @@ msgstr "bushyinguro Bivuye Ubwihisho"
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "bushyinguro Bivuye Seriveri"
 
-#: lib/protocols.c:454 lib/protocols.c:486 lib/protocols.c:525
-#: lib/protocols.c:557
-#, fuzzy, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Guhindura.... Ikurikiranyanyuguti Bivuye Inyuguti Gushyiraho Kuri Inyuguti "
-"Gushyiraho"
-
-#. Don't use request->logging_function since the strings must be in UTF-8
-#. for the GTK+ 2.x port
-#: lib/protocols.c:469
-#, fuzzy, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
-msgstr "Guhindura.... Ikurikiranyanyuguti Kuri 8 Bivuye KIGEZWEHO Umwanya"
-
-#. Don't use request->logging_function since the strings must be in UTF-8
-#. for the GTK+ 2.x port
-#: lib/protocols.c:540
-#, fuzzy, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr "Guhindura.... Ikurikiranyanyuguti Kuri KIGEZWEHO Umwanya Bivuye 8"
-
-#: lib/protocols.c:629
+#: lib/protocols.c:450
 #, fuzzy, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr "Inzira Bidakora Bya IDOSIYE Inzira BIHUYE i KIGEZWEHO bushyinguro"
 
-#: lib/protocols.c:647
+#: lib/protocols.c:481
 #, fuzzy, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Kwandika Kuri Ubwihisho"
 
-#: lib/protocols.c:680
+#: lib/protocols.c:514
 #, fuzzy, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "OYA Gushaka Akamenyetso"
 
-#: lib/protocols.c:687
+#: lib/protocols.c:521
 #, fuzzy, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Akamenyetso Icyinjijwe OYA a"
 
-#: lib/protocols.c:826 lib/protocols.c:853
+#: lib/protocols.c:643 lib/protocols.c:670
 #, fuzzy, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Porotokole ni OYA"
 
-#: lib/protocols.c:1167 lib/protocols.c:1182 lib/protocols.c:2214
-#: lib/protocols.c:2324
-#, fuzzy, c-format
-msgid "Looking up %s\n"
-msgstr "Hejuru"
-
-#: lib/protocols.c:1173 lib/protocols.c:1188 lib/protocols.c:2219
-#: lib/protocols.c:2329
-#, fuzzy, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Hejuru Izina ry'inturo:"
-
-#: lib/protocols.c:2237
-#, fuzzy, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Kuri Kurema a"
-
-#: lib/protocols.c:2243 lib/protocols.c:2346
+#: lib/protocols.c:1153
 #, c-format
-msgid "Trying %s:%d\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: lib/protocols.c:2248 lib/protocols.c:2353
-#, fuzzy, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Kwihuza Kuri"
-
-#: lib/protocols.c:2283 lib/rfc959.c:640
-#, fuzzy, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Kuri Kurema a"
-
-#: lib/protocols.c:2307 lib/sshv2.c:1046
-#, fuzzy, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "Hejuru Serivisi Izina: Kugenzura..."
-
-#: lib/protocols.c:2369 lib/protocols.c:3009 lib/rfc959.c:649 lib/rfc959.c:826
-#, fuzzy, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Gushyiraho Gufunga ku Ibendera"
-
-#: lib/protocols.c:2376
-#, fuzzy, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Kuri"
-
-#: lib/protocols.c:2607 lib/protocols.c:2682 lib/sshv2.c:355
-#, fuzzy, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Kuri"
-
-#: lib/protocols.c:2750
-#, fuzzy, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Kubona Amabendera"
-
-#: lib/protocols.c:2764
-#, fuzzy, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Gushyiraho Kuri"
-
-#: lib/protocols.c:2899
+#: lib/protocols.c:1531
 #, fuzzy, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "Ipaji Byatandukanye"
 
-#: lib/protocols.c:2907
+#: lib/protocols.c:1539
 #, fuzzy, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Ipaji Byatandukanye in"
 
-#: lib/pty.c:297
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
+#, fuzzy, c-format
+msgid "Error: Cannot set close on exec flag: %s\n"
+msgstr "Gushyiraho Gufunga ku Ibendera"
+
+#: lib/pty.c:301
 #, fuzzy, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Gufungura Mugenga"
 
-#: lib/pty.c:305
+#: lib/pty.c:309
 #, fuzzy, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kurema a"
 
-#: lib/pty.c:334
+#: lib/pty.c:338
 #, fuzzy, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Gukora"
 
-#: lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
@@ -1047,34 +998,34 @@ msgstr "Koresha HTTP 1. 1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Kuri Gukoresha 1. 1. Cyangwa 1. 0"
 
-#: lib/rfc2068.c:150 lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "Bivuye Seriveri Ingano ku i"
 
-#: lib/rfc2068.c:254 lib/rfc959.c:608 lib/sshv2.c:1123
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, fuzzy, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Bivuye Ipaji"
 
-#: lib/rfc2068.c:303
+#: lib/rfc2068.c:301
 #, fuzzy
 msgid "Starting the file transfer at offset "
 msgstr "i IDOSIYE ku Nta- boneza"
 
-#: lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, fuzzy, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "IDOSIYE"
 
-#: lib/rfc2068.c:423 lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 #, fuzzy
 msgid "Retrieving directory listing...\n"
 msgstr "bushyinguro"
 
-#: lib/rfc2068.c:819 lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 #, fuzzy
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Bivuye Seriveri"
@@ -1219,9 +1170,9 @@ msgstr "Idosiye in Ubwoko"
 #: lib/rfc959.c:87
 #, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1229,18 +1180,23 @@ msgstr ""
 "Sisitemu kugirango Umwandiko Idosiye Bivuye Kuri Hanyuma ni Kuri iyi "
 "Bidakora Iyimura... Nyabibiri Ibyatanzwe Kuri iyi"
 
-#: lib/rfc959.c:322 lib/rfc959.c:331 lib/rfc959.c:342 lib/rfc959.c:789
-#: lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, fuzzy, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "BYAKIRIWE Bivuye Seriveri"
 
-#: lib/rfc959.c:679 lib/rfc959.c:689
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, fuzzy, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Kuri Kurema a"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, fuzzy, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Gushaka Aderesi in"
 
-#: lib/rfc959.c:715
+#: lib/rfc959.c:775
 #, fuzzy, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
@@ -1260,48 +1216,48 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: lib/rfc959.c:726 lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, fuzzy, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Kurema a Ibyatanzwe Ukwihuza"
 
-#: lib/rfc959.c:738 lib/rfc959.c:759 lib/rfc959.c:912
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, fuzzy, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Kubona Izina:"
 
-#: lib/rfc959.c:749 lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, fuzzy, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "a Umuyoboro"
 
-#: lib/rfc959.c:768 lib/rfc959.c:921
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, fuzzy, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "ku Umuyoboro"
 
-#: lib/rfc959.c:817
+#: lib/rfc959.c:876
 #, fuzzy, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Kuri Kurema a"
 
-#: lib/rfc959.c:837
+#: lib/rfc959.c:895
 #, fuzzy
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "nka Twebwe Biturutse Ukwihuza"
 
-#: lib/rfc959.c:865 lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, fuzzy, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kubona Aderesi Bya"
 
-#: lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, fuzzy, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kwemera Ukwihuza Bivuye Seriveri"
@@ -1310,16 +1266,66 @@ msgstr "Kwemera Ukwihuza Bivuye Seriveri"
 # sc/source\ui\src\autofmt.src:RID_SCDLG_AUTOFORMAT.STR_SUM.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_PIVOT_TOTAL.text
-#: lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 #, fuzzy
 msgid "total"
 msgstr "Igiteranyo"
 
-#: lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, fuzzy, c-format
+msgid "Looking up %s\n"
+msgstr "Hejuru"
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, fuzzy, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "Hejuru Izina ry'inturo:"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, fuzzy, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Kuri Kurema a"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, fuzzy, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr "Kwihuza Kuri"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, fuzzy, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Kuri"
+
+#: lib/socket-connect-gethostbyname.c:101 lib/sshv2.c:1168
+#, fuzzy, c-format
+msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgstr "Hejuru Serivisi Izina: Kugenzura..."
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, fuzzy, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Kuri"
+
+#: lib/sockutils.c:338
+#, fuzzy, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Kubona Amabendera"
+
+#: lib/sockutils.c:352
+#, fuzzy, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Gushyiraho Kuri"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr ""
@@ -1351,183 +1357,180 @@ msgstr ""
 msgid "Require a username/password for SSH connections"
 msgstr "a Izina ry'ukoresha Ijambobanga... kugirango Ukwihuza"
 
-#: lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, fuzzy, c-format
 msgid "Running program %s\n"
 msgstr "Porogaramu"
 
-#: lib/sshv2.c:307
+#: lib/sshv2.c:378
 #, fuzzy
 msgid "Enter passphrase for RSA key"
 msgstr "kugirango Urufunguzo"
 
-#: lib/sshv2.c:308
+#: lib/sshv2.c:379
 #, fuzzy
 msgid "Enter passphrase for key '"
 msgstr "kugirango Urufunguzo"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.FT_PASSWORD.text
-#: lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Ijambobanga"
 
-#: lib/sshv2.c:310
+#: lib/sshv2.c:381
 #, fuzzy
 msgid "password"
 msgstr "ijambobanga"
 
-#: lib/sshv2.c:414
+#: lib/sshv2.c:496
 #, fuzzy
 msgid "(yes/no)?"
 msgstr "(Yego Oya"
 
-#: lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr ""
 
 # sfx2/source\dialog\passwd.src:DLG_PASSWD.text
-#: lib/sshv2.c:436 src/gtk/gtkui.c:118 src/gtk/transfer.c:554
-#: src/gtk/transfer.c:564
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Kwandika Ijambobanga"
 
-#: lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr ""
 
-#: lib/sshv2.c:487
+#: lib/sshv2.c:567
 #, fuzzy
 msgid "Error: An incorrect password was entered\n"
 msgstr "Ijambobanga..."
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, fuzzy, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d:Verisiyo"
 
-#: lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, fuzzy, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d:IDOSIYE"
 
-#: lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, fuzzy, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d:bushyinguro"
 
-#: lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, fuzzy, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d:bushyinguro"
 
-#: lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, fuzzy, c-format
 msgid "%d: File attributes\n"
 msgstr "%d:Idosiye"
 
-#: lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
 # crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
-#: lib/sshv2.c:609 src/gtk/bookmarks.c:1045 src/gtk/bookmarks.c:1298
-#: src/gtk/chmod_dialog.c:253 src/gtk/gtkui_transfer.c:368
-#: src/gtk/misc-gtk.c:1011 src/gtk/options_dialog.c:1208
-#: src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "YEGO"
 
-#: lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: lib/sshv2.c:615
+#: lib/sshv2.c:696
 #, fuzzy
 msgid "No such file or directory"
 msgstr "IDOSIYE Cyangwa bushyinguro"
 
-#: lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
-#: lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:624
+#: lib/sshv2.c:705
 #, fuzzy
 msgid "Bad message"
 msgstr "Ubutumwa"
 
-#: lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nta kwihuza"
 
-#: lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Kwihuza byahagaze "
 
-#: lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr ""
 
-#: lib/sshv2.c:636
+#: lib/sshv2.c:717
 #, fuzzy
 msgid "Unknown message returned from server"
 msgstr "Ubutumwa Bivuye Seriveri"
 
-#: lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, fuzzy, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Ingano"
 
-#: lib/sshv2.c:730 lib/sshv2.c:1225 lib/sshv2.c:1821 lib/sshv2.c:1959
+#: lib/sshv2.c:811 lib/sshv2.c:1346 lib/sshv2.c:1838 lib/sshv2.c:1957
 #, fuzzy, c-format
 msgid "Error: Message size %d too big from server\n"
 msgstr "Ingano Bivuye"
 
-#: lib/sshv2.c:736
+#: lib/sshv2.c:817
 #, fuzzy
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
@@ -1535,12 +1538,12 @@ msgid ""
 msgstr ""
 "Ikosa Gutangiza a Ukwihuza Na: i Seriveri Ikosa Ubutumwa Bivuye i Seriveri"
 
-#: lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, fuzzy, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Ukwihuza Kuri"
 
-#: lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, fuzzy, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Seriveri"
@@ -1586,7 +1589,7 @@ msgstr "Na: Impamyabushobozi ku Ubujyakuzimu"
 msgid "Cannot get peer certificate\n"
 msgstr "Kubona"
 
-#: lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, fuzzy, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1594,67 +1597,51 @@ msgid ""
 msgstr ""
 "Ubuturo in i Impamyabushobozi OYA BIHUYE i Ubuturo Twebwe Kuri Ukwihuza"
 
-#: lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 #, fuzzy
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "gutangiza i"
 
-#: lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 #, fuzzy
 msgid "Error loading default SSL certificates\n"
 msgstr "Itangira... Mburabuzi"
 
-#: lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 #, fuzzy
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Igenamiterere Cipher Urutonde Oya Byemewe"
 
-#: lib/sslcommon.c:342 lib/sslcommon.c:416 lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 #, fuzzy
 msgid "Error: SSL engine was not initialized\n"
 msgstr "OYA"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 #, fuzzy
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Igenamiterere Hejuru Ukwihuza Igikoresho"
 
-#: lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 #, fuzzy
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Igenamiterere Hejuru Ukwihuza Igikoresho"
 
-#: lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Na: Impamyabushobozi"
 
-#: src/uicommon/gftpui.c:91
-#, fuzzy, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "amasogonda Kuri Kwihuza"
-
-#: src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:190
-#, fuzzy
-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 ""
-">.Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+#: src/uicommon/gftpui.c:65
+#, fuzzy, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "amasogonda Kuri Kwihuza"
 
-#: src/uicommon/gftpui.c:191
+#: src/uicommon/gftpui.c:156
 #, fuzzy
 msgid ""
 "gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. "
@@ -1664,102 +1651,102 @@ msgstr ""
 "Na: kugirango Birambuye i IDOSIYE ni Kigenga Na Urakaza neza Kuri kugirango "
 "Birambuye i"
 
-#: src/uicommon/gftpui.c:193 src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 #, fuzzy
 msgid "Translated by"
 msgstr "ku"
 
-#: src/uicommon/gftpui.c:240 src/uicommon/gftpui.c:282
-#: 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:872
+#: 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
 #, fuzzy
 msgid "Error: Not connected to a remote site\n"
 msgstr "Kuri a"
 
-#: src/uicommon/gftpui.c:251
+#: src/uicommon/gftpui.c:216
 #, fuzzy
 msgid "usage: chmod <mode> <file>\n"
 msgstr "Ikoresha: Ubwoko IDOSIYE"
 
-#: src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 #, fuzzy
 msgid "usage: rename <old name> <new name>\n"
 msgstr "Ikoresha: Guhindura izina ki/ bishaje Izina: Gishya Izina:"
 
-#: src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 #, fuzzy
 msgid "usage: delete <file>\n"
 msgstr "Ikoresha: Gusiba IDOSIYE"
 
-#: src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 #, fuzzy
 msgid "usage: rmdir <directory>\n"
 msgstr "Ikoresha: bushyinguro"
 
-#: src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 #, fuzzy
 msgid "usage: site <site command>\n"
 msgstr "Ikoresha: Ipaji Ipaji Komandi:"
 
-#: src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 #, fuzzy
 msgid "usage: mkdir <new directory>\n"
 msgstr "Ikoresha: Gishya bushyinguro"
 
-#: src/uicommon/gftpui.c:469 src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 #, fuzzy
 msgid "usage: chdir <directory>\n"
 msgstr "Ikoresha: bushyinguro"
 
-#: src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 #, fuzzy
 msgid "Clear the directory cache\n"
 msgstr "i bushyinguro"
 
-#: src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 #, fuzzy
 msgid "usage: open "
 msgstr "Ikoresha: Gufungura"
 
-#: src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 #, fuzzy
 msgid "usage: set [variable = value]\n"
 msgstr "Ikoresha: Gushyiraho IMPINDURAGACIRO Agaciro"
 
-#: src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, fuzzy, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ni OYA a Byemewe Iboneza IMPINDURAGACIRO"
 
-#: src/uicommon/gftpui.c:754
+#: src/uicommon/gftpui.c:725
 #, fuzzy, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "ni OYA Bihari in i Umwandiko Umuyoboro Bya"
 
-#: src/uicommon/gftpui.c:836
+#: src/uicommon/gftpui.c:807
 #, fuzzy
 msgid ""
 "Supported commands:\n"
 "\n"
 msgstr "Amabwiriza"
 
-#: src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, fuzzy, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "Ikoresha:"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 #, fuzzy
 msgid "about"
 msgstr "Bigyanye"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 #, fuzzy
 msgid "Shows gFTP information"
 msgstr "Ibisobanuro"
@@ -1772,12 +1759,12 @@ msgstr "Ibisobanuro"
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PPM.FileFormat..1.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....FormLetter.MailingOutput.Format..1.text
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 #, fuzzy
 msgid "ascii"
 msgstr "ASCII"
 
-#: src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 #, fuzzy
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "i KIGEZWEHO IDOSIYE Ubwoko Kuri kugirango"
@@ -1788,44 +1775,44 @@ msgstr "i KIGEZWEHO IDOSIYE Ubwoko Kuri kugirango"
 # goodies/source\filter.vcl\epgm\dlgepgm.src:DLG_EXPORT_EPGM.RB_RAW.text
 # #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
 # goodies/source\filter.vcl\eppm\dlgeppm.src:DLG_EXPORT_EPPM.RB_RAW.text
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:941
 #, fuzzy
 msgid "binary"
 msgstr "Nyabibiri"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 #, fuzzy
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "i KIGEZWEHO IDOSIYE Ubwoko Kuri kugirango"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:971 src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 #, fuzzy
 msgid "Changes the remote working directory"
 msgstr "i bushyinguro"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr ""
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 #, fuzzy
 msgid "Changes the permissions of a remote file"
 msgstr "i Uruhushya Bya a IDOSIYE"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 #, fuzzy
 msgid "clear"
 msgstr "Gusiba"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 #, fuzzy
 msgid "Available options: cache"
 msgstr "Amahitamo Ubwihisho"
@@ -1838,159 +1825,159 @@ msgstr "Amahitamo Ubwihisho"
 # basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 #, fuzzy
 msgid "close"
 msgstr "Gufunga"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 #, fuzzy
 msgid "Disconnects from the remote site"
 msgstr "Bivuye i Ipaji"
 
 # sfx2/source\statbar\statbar.src:RID_DICTATION_COMMANDS.17.text
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "gusiba"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 #, fuzzy
 msgid "Removes a remote file"
 msgstr "a IDOSIYE"
 
-#: src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:983 src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 #, fuzzy
 msgid "Shows the directory listing for the current remote directory"
 msgstr "i bushyinguro kugirango i KIGEZWEHO bushyinguro"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 #, fuzzy
 msgid "get"
 msgstr "Kubona"
 
-#: src/uicommon/gftpui.c:985 src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 #, fuzzy
 msgid "Downloads remote file(s)"
 msgstr "IDOSIYE S"
 
-#: src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 #, fuzzy
 msgid "help"
 msgstr "Ifashayobora"
 
-#: src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 #, fuzzy
 msgid "Shows this help screen"
 msgstr "iyi Ifashayobora Mugaragaza"
 
-#: src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:989 src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 #, fuzzy
 msgid "Changes the local working directory"
 msgstr "i bushyinguro"
 
-#: src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr ""
 
-#: src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 #, fuzzy
 msgid "Changes the permissions of a local file"
 msgstr "i Uruhushya Bya a IDOSIYE"
 
-#: src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr ""
 
-#: src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 #, fuzzy
 msgid "Removes a local file"
 msgstr "a IDOSIYE"
 
-#: src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:997 src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 #, fuzzy
 msgid "Shows the directory listing for the current local directory"
 msgstr "i bushyinguro kugirango i KIGEZWEHO bushyinguro"
 
-#: src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 #, fuzzy
 msgid "Creates a local directory"
 msgstr "a bushyinguro"
 
-#: src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 #, fuzzy
 msgid "Show current local directory"
 msgstr "KIGEZWEHO bushyinguro"
 
-#: src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 #, fuzzy
 msgid "Rename a local file"
 msgstr "a IDOSIYE"
 
-#: src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 #, fuzzy
 msgid "Remove a local directory"
 msgstr "a bushyinguro"
 
 # sw/source\ui\index\cnttab.src:TP_TOX_ENTRY.WIN_TOKEN.STR_TOKEN_LINK_START.text
-#: src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 #, fuzzy
 msgid "ls"
 msgstr "LS"
 
-#: src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 #, fuzzy
 msgid "Creates a remote directory"
 msgstr "a bushyinguro"
 
-#: src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1015 src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 #, fuzzy
 msgid "Uploads local file(s)"
 msgstr "IDOSIYE S"
@@ -2001,108 +1988,115 @@ msgstr "IDOSIYE S"
 # sfx2/source\dialog\cfg.src:STR_OPEN.text
 # #-#-#-#-#  sfx2.pot (PACKAGE VERSION)  #-#-#-#-#
 # sfx2/source\dialog\versdlg.src:DLG_VERSIONS.PB_OPEN.text
-#: src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 #, fuzzy
 msgid "open"
 msgstr "Gufungura"
 
-#: src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 #, fuzzy
 msgid "Opens a connection to a remote site"
 msgstr "a Ukwihuza Kuri a Ipaji"
 
-#: src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 #, fuzzy
 msgid "put"
 msgstr "Gushyira"
 
-#: src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 #, fuzzy
 msgid "Show current remote directory"
 msgstr "KIGEZWEHO bushyinguro"
 
-#: src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 #, fuzzy
 msgid "quit"
 msgstr "Kuvamo"
 
-#: src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 #, fuzzy
 msgid "Exit from gFTP"
 msgstr "Bivuye"
 
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_RENAMECURRENT.text
-#: src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 #, fuzzy
 msgid "rename"
 msgstr "Guhindura izina"
 
-#: src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 #, fuzzy
 msgid "Rename a remote file"
 msgstr "a IDOSIYE"
 
-#: src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 #, fuzzy
 msgid "Remove a remote directory"
 msgstr "a bushyinguro"
 
-#: src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 #, fuzzy
 msgid "set"
 msgstr "Gushyiraho"
 
-#: src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 #, fuzzy
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "Iboneza IDOSIYE Ibihinduka Gushyiraho Ibihinduka ku Gushyiraho VAR"
 
-#: src/uicommon/gftpui.c:1031
+#: src/uicommon/gftpui.c:1004
 #, fuzzy
 msgid "site"
 msgstr "Ipaji"
 
-#: src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "a Ipaji Komandi:"
 
-#: src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 #, fuzzy
 msgid "Error: Command not recognized\n"
 msgstr "OYA"
 
-#: src/uicommon/gftpui.c:1375
-#, fuzzy
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "Ipaji Byatandukanye Nyuma Kuri"
+#: src/uicommon/gftpui.c:1304
+#, fuzzy, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Yoherejwe ku"
 
-#: src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, fuzzy, c-format
-msgid "Could not download %s from %s\n"
-msgstr "OYA Gufungura Bivuye"
+msgid "Skipping file %s on host %s\n"
+msgstr "IDOSIYE ku Ubuturo"
 
-#: src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, fuzzy, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Yoherejwe ku"
+msgid "Stopping the transfer on host %s\n"
+msgstr "i ku Ubuturo"
 
-#: src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1505
 #, fuzzy, c-format
-msgid "There was an error transfering the file %s"
-msgstr "Ikosa i IDOSIYE"
+msgid "Could not download %s from %s\n"
+msgstr "OYA Gufungura Bivuye"
 
-#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:213
-#: src/gtk/gftp-gtk.c:1063 src/gtk/misc-gtk.c:512 src/gtk/misc-gtk.c:520
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, fuzzy, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s:kanda i Guhagarara Akabuto Itangira Kuri"
@@ -2144,173 +2138,169 @@ msgstr "i Izina: Bya i Akamenyetso Kuri ku a Kuri Gushyira a"
 msgid "Remember password"
 msgstr "Nyibutsa Urufunguzo"
 
-#: src/gtk/bookmarks.c:473 src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Injiza a Izina: kugirango i"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Idosiye nshya"
 
-#: src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 #, fuzzy
 msgid "Enter the name of the new folder to create"
 msgstr "i Izina: Bya i Gishya Ububiko Kuri Kurema"
 
-#: src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Idosiye"
+
+#: src/gtk/bookmarks.c:474
 #, fuzzy
 msgid "Enter the name of the new item to create"
 msgstr "i Izina: Bya i Gishya Ikintu Kuri Kurema"
 
-#: src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:547
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr "Kuri i Na Byose"
 
 # sw/source\ui\wrtsh\wrtsh.src:STR_DELBOOKMARK.text
-#: src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 #, fuzzy
 msgid "Delete Bookmark"
 msgstr "Gusiba akamenyetso"
 
 # sfx2/source\appl\newhelp.src:WIN_HELP_INDEX.TC_INDEX.HELP_INDEX_PAGE_BOOKMARKS.text
-#: src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Ibirango"
 
-#: src/gtk/bookmarks.c:850 src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr ""
 
-#: src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Umwirondoro"
 
-#: src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 #, fuzzy
 msgid "Hostname:"
 msgstr "Izina ry'inturo:"
 
-#: src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Impagikiro:"
 
 # offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_OTHER.text
-#: src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 #, fuzzy
 msgid "Protocol:"
 msgstr "Porotokole"
 
-#: src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr ""
 
-#: src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 #, fuzzy
 msgid "Local Directory:"
 msgstr "Ububiko bwo hafi:"
 
-#: src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 #, fuzzy
 msgid "Username:"
 msgstr "Izina ry'ukoresha"
 
 # sc/source\ui\src\scstring.src:SCSTR_PASSWORD.text
-#: src/gtk/bookmarks.c:1003 src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Ijambobanga:"
 
 # svtools/source\dialogs\logindlg.src:DLG_LOGIN.FT_LOGIN_ACCOUNT.text
-#: src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 #, fuzzy
 msgid "Account:"
 msgstr "Konti:"
 
-#: src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 #, fuzzy
 msgid "Log in as ANONYMOUS"
 msgstr "in Nka"
 
-# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#: src/gtk/bookmarks.c:1056 src/gtk/bookmarks.c:1309
-#: src/gtk/chmod_dialog.c:265 src/gtk/gtkui_transfer.c:380
-#: src/gtk/options_dialog.c:1219 src/gtk/options_dialog.c:1453
-#, fuzzy
-msgid "  Cancel  "
-msgstr "Kureka"
-
-# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.TBX_SUBSTNEWDEL.BT_SUBSTAPPLY.text
-#: src/gtk/bookmarks.c:1065 src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Gukurikiza"
-
-#: src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 #, fuzzy
 msgid "/_File"
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 #, fuzzy
 msgid "/File/tearoff"
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1217
+#: src/gtk/bookmarks.c:1156
 #, fuzzy
-msgid "/File/New Folder..."
+msgid "/File/New _Folder..."
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1218
+#: src/gtk/bookmarks.c:1157
 #, fuzzy
-msgid "/File/New Item..."
+msgid "/File/New _Item..."
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1219
+#: src/gtk/bookmarks.c:1158
 #, fuzzy
-msgid "/File/Delete"
+msgid "/File/_Delete"
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1220
+#: src/gtk/bookmarks.c:1159
 #, fuzzy
-msgid "/File/Properties..."
+msgid "/File/_Properties..."
 msgstr "/Idosiye"
 
-#: src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 #, fuzzy
 msgid "/File/sep"
 msgstr "/Idosiye Itandukanya"
 
-#: src/gtk/bookmarks.c:1222
+#: src/gtk/bookmarks.c:1161
 #, fuzzy
-msgid "/File/Close"
+msgid "/File/_Close"
 msgstr "/Idosiye Funga"
 
-#: src/gtk/bookmarks.c:1240 src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:132 src/gtk/chmod_dialog.c:137
-#: src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 #, fuzzy
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr "NONEAHA i Ibiranga Bya IDOSIYE S Byose FTP Gushigikira i"
 
-#: src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Bidasanzwe"
 
-#: src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
@@ -2320,12 +2310,12 @@ msgstr ""
 # svx/source\dialog\page.src:RID_SVXSTRARY_PAPERSIZE_STD.13.text
 # #-#-#-#-#  svx.pot (PACKAGE VERSION)  #-#-#-#-#
 # svx/source\dialog\page.src:RID_SVXSTRARY_PAPERSIZE_DRAW.16.text
-#: src/gtk/chmod_dialog.c:192 src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Ukoresha"
 
-#: src/gtk/chmod_dialog.c:200 src/gtk/chmod_dialog.c:220
-#: src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Soma"
 
@@ -2333,13 +2323,13 @@ msgstr "Soma"
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.HTML.Export.Browser..3.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....FormLetter.MailingOutput.Format..8.text
-#: src/gtk/chmod_dialog.c:204 src/gtk/chmod_dialog.c:224
-#: src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Kwandika"
 
-#: src/gtk/chmod_dialog.c:208 src/gtk/chmod_dialog.c:228
-#: src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Gukora"
 
@@ -2347,12 +2337,12 @@ msgstr "Gukora"
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MAKEOUTLINE.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_GROUP.text
-#: src/gtk/chmod_dialog.c:212 src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Itsinda"
 
 # framework/source\classes\fltdlg.src:STR_FILTER_OTHERS.text
-#: src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Ikindi"
 
@@ -2379,12 +2369,11 @@ msgstr ""
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
-#: src/gtk/delete_dialog.c:90 src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Gusiba"
 
-#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1064 src/gtk/misc-gtk.c:946
-#: src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Kwihuza"
 
@@ -2401,397 +2390,408 @@ msgstr ""
 # setup2/source\ui\app.src:STR_RESTART_BTN_NO.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_LOGOUT_BTN_NO.text
-#: src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Gusohoka"
 
-#: src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 #, fuzzy
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr "IDOSIYE in Aho bigeze Kuri Gusohoka"
 
-#: src/gtk/gftp-gtk.c:198
+# basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 #, fuzzy
-msgid "Connect via URL"
-msgstr "Biturutse"
+msgid "Open Location"
+msgstr "Amahitamo"
 
-#: src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 #, fuzzy
 msgid "Enter a URL to connect to"
 msgstr "a Kuri Kwihuza Kuri"
 
-#: src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr ""
-
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:246
+#: src/gtk/gftp-gtk.c:265
 #, fuzzy
-msgid "/FTP/Window 1"
+msgid "/FTP/Window _1"
 msgstr "/1."
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:267
 #, fuzzy
-msgid "/FTP/Window 2"
+msgid "/FTP/Window _2"
 msgstr "/2."
 
-#: src/gtk/gftp-gtk.c:250 src/gtk/gftp-gtk.c:255 src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 #, fuzzy
 msgid "/FTP/sep"
 msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
-msgstr ""
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
-msgstr ""
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:264 src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 #, fuzzy
 msgid "/Local/sep"
 msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:287
 #, fuzzy
-msgid "/Local/Show selected"
+msgid "/Local/_Show selected"
 msgstr "/Byahiswemo"
 
-#: src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
-msgstr ""
+# sfx2/sdi\sfxslots.src:SID_SELECTALL.text
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
+msgstr "Guhitamo Byose"
 
-#: src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 #, fuzzy
 msgid "/Local/Save Directory Listing..."
 msgstr "/Kubika"
 
-#: src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
+msgstr "Ububiko bwo hafi:"
 
-#: src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
+msgstr "/Byahiswemo"
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
-msgstr ""
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:287 src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 #, fuzzy
 msgid "/Remote/sep"
 msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
-msgid "/Remote/Show selected"
+msgid "/Remote/_Show selected"
 msgstr "/Byahiswemo"
 
-#: src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
-msgstr ""
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "/Byahiswemo"
 
-#: src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 #, fuzzy
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Kubika"
 
-#: src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
-msgstr ""
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
+msgstr "/Kubika"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
+msgstr "/Byahiswemo"
 
-#: src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
-msgstr ""
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 #, fuzzy
 msgid "/_Bookmarks"
 msgstr "/Ibimenyetso"
 
-#: src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
-msgid "/Bookmarks/Add bookmark"
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Akamenyetso"
 
-#: src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
-msgid "/Bookmarks/Edit bookmarks"
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Ibirango"
 
-#: src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 #, fuzzy
 msgid "/Bookmarks/sep"
 msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
-msgstr ""
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
-msgid "/Transfers/Start Transfer"
+msgid "/Transfer/_Start"
 msgstr "/Gutangira"
 
-#: src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr ""
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:315 src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
-msgid "/Transfers/sep"
+msgid "/Transfer/sep"
 msgstr "/Itandukanya"
 
-#: src/gtk/gftp-gtk.c:316
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
-msgid "/Transfers/Skip Current File"
+msgid "/Transfer/Skip _Current File"
 msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
-msgid "/Transfers/Remove File"
+msgid "/Transfer/_Remove File"
 msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
-msgid "/Transfers/Move File Up"
+msgid "/Transfer/Move File _Up"
 msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
-msgid "/Transfers/Move File Down"
+msgid "/Transfer/Move File _Down"
 msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
-msgstr ""
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
-msgstr ""
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
+msgstr "/Idosiye"
 
-#: src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:329
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
-msgid "/Logging/View log"
+msgid "/Log/_View"
 msgstr "/LOG"
 
-#: src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
-msgid "/Logging/Save log..."
+msgid "/Log/_Save..."
 msgstr "/Kubika LOG"
 
-#: src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 #, fuzzy
 msgid "/Help"
 msgstr "/Kugoboka"
 
-#: src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+msgid "/Help/_About"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:458
-#, fuzzy
-msgid "Host: "
-msgstr "Inturo:"
-
-#: src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 #, fuzzy
 msgid "_Host: "
 msgstr "Inturo:"
 
-#: src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 #, fuzzy
 msgid "Port: "
 msgstr "Impagikiro:"
 
-#: src/gtk/gftp-gtk.c:507
-#, fuzzy
-msgid "User: "
-msgstr "Ukoresha:"
-
-#: src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 #, fuzzy
 msgid "_User: "
 msgstr "Ukoresha:"
 
-#: src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr ""
 
 # padmin/source\rtsetup.src:RID_RTS_COMMANDPAGE.RID_RTS_CMD_TXT_CONNECT.text
-#: src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komandi"
 
-#: src/gtk/gftp-gtk.c:746 src/gtk/gftp-gtk.c:952 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Izina ry'idosiye"
 
@@ -2799,246 +2799,230 @@ msgstr "Izina ry'idosiye"
 # goodies/source\filter.vcl\eos2met\dlgeos2.src:DLG_EXPORT_EMET.GRP_SIZE.text
 # #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
 # goodies/source\filter.vcl\epict\dlgepct.src:DLG_EXPORT_EPCT.GRP_SIZE.text
-#: src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Ingano"
 
-#: src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Itariki"
 
-#: src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
 # padmin/source\padialog.src:RID_PROGRESS_DLG.RID_PROGRESS_PROGRESS_TXT.text
-#: src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Aho bigeze"
 
-#: src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 #, fuzzy
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Ubwoko in a Ubuturo Kuri Kwihuza"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Kugira gishya"
 
-#: src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr ""
 
-#: src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 #, fuzzy
 msgid "Please enter your username for this site"
 msgstr "Injiza Izina ry'ukoresha kugirango iyi Ipaji"
 
-#: src/gtk/gtkui.c:119 src/gtk/transfer.c:555 src/gtk/transfer.c:565
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 #, fuzzy
 msgid "Please enter your password for this site"
 msgstr "Injiza Ijambobanga... kugirango iyi Ipaji"
 
-#: src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 #, fuzzy
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Injiza a"
 
-#: src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 #, fuzzy
 msgid "Enter name of directory to create"
 msgstr "Izina: Bya bushyinguro Kuri Kurema"
 
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_RENAMECURRENT.text
-#: src/gtk/gtkui.c:346 src/gtk/gtkui.c:358 src/gtk/misc-gtk.c:949
-#: src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Guhindura izina"
 
-#: src/gtk/gtkui.c:356
+#: src/gtk/gtkui.c:368
 #, fuzzy, c-format
 msgid "What would you like to rename %s to?"
 msgstr "nka Kuri Guhindura izina Kuri"
 
-#: src/gtk/gtkui.c:378 src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Ipaji"
 
-#: src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:393
 #, fuzzy
 msgid "Enter site-specific command"
 msgstr "Ipaji Komandi:"
 
-#: src/gtk/gtkui.c:382
+#: src/gtk/gtkui.c:394
 #, fuzzy
 msgid "Prepend with SITE"
 msgstr "Na:"
 
-#: src/gtk/gtkui.c:425 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr ""
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:450 src/gtk/transfer.c:533
-#: src/gtk/transfer.c:1012
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr ""
 
 # so3/src\svuidlg.src:MD_UPDATE_BASELINKS.STR_WAITINGLINK.text
-#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:512 src/gtk/transfer.c:537
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 #, fuzzy
 msgid "Waiting..."
 msgstr "Tegereza"
 
 # sw/source\ui\wrtsh\wrtsh.src:STR_OVR_UNDO.text
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:303
-#: src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Gusimbuza"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:309
-#: src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Guca make"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr ""
 
 # sc/source\ui\miscdlgs\acredlin.src:RID_POPUP_CHANGES.SC_SUB_SORT.SC_SORT_ACTION.text
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Igikorwa"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 #, fuzzy
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr "IDOSIYE S ku Byombi i Na Guhitamo nka Kuri"
 
-#: src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Ikosa"
 
-#: src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 #, fuzzy
 msgid "Skip File"
 msgstr "Idosiye"
 
 # sfx2/sdi\sfxslots.src:SID_SELECTALL.text
-#: src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Guhitamo Byose"
 
-#: src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr ""
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 #, fuzzy
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Injiza a"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr ""
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 #, fuzzy
 msgid "Enter the new file specification"
 msgstr "i Gishya IDOSIYE"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:377
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, fuzzy, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Gufungura kugirango"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 #, fuzzy
 msgid "Save Directory Listing"
 msgstr "Kubika"
 
-#: src/gtk/menu-items.c:341 src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, fuzzy, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Kuri"
 
-#: src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, fuzzy, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "i LOG IDOSIYE Kuri"
 
-#: src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 #, fuzzy
 msgid "Save Log"
 msgstr "Kubika"
 
-#: src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, fuzzy, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "Gushaka i IDOSIYE Ubwoko ni in Cyangwa in"
 
-#: src/gtk/menu-items.c:468 src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr ""
 
-#: src/gtk/menu-items.c:504
+#: src/gtk/menu-items.c:460
 #, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr "%sC org HTTP www org ku com"
 
-#: src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Bigyanye"
 
-#: src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Amasezerano y'Iyemererakoresha"
 
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_STR_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#: src/gtk/menu-items.c:571 src/gtk/view_dialog.c:404
-#, fuzzy
-msgid "  Close  "
-msgstr "Gufunga"
-
-#: src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 #, fuzzy
 msgid "Disconnect from the remote server"
 msgstr "Bivuye i Seriveri"
 
-#: src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 #, fuzzy
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
@@ -3047,173 +3031,114 @@ msgstr ""
 "Kuri i Ipaji in i Ubuturo Icyinjijwe i Ubuturo Icyinjijwe ni Ahatanditseho "
 "Hanyuma a Ikiganiro ni Kwemerera Kuri Injiza a"
 
-#: src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Amadosiye yose"
 
-#: src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr ""
 
 # basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, fuzzy, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Hari ikibazo mu gufungura dosiye"
 
-#: src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, fuzzy, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s:Kuri a"
 
-#: src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, fuzzy, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s:ni OYA Bihari ikoresha iyi"
 
-#: src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, fuzzy, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s:Ikintu"
 
-#: src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, fuzzy, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s:ku Ikintu"
 
-#: src/gtk/misc-gtk.c:943 src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 #, fuzzy
 msgid "Change"
 msgstr "Guhindura"
 
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\miscdlgs.src:RID_SCDLG_COL_OPT.FT_LABEL.text
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\miscdlgs.src:RID_SCDLG_ROW_OPT.FT_LABEL.text
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\scstring.src:STR_OPT_ROWHEIGHT.text
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\scstring.src:STR_OPT_COLWIDTH.text
-#: src/gtk/misc-gtk.c:1014 src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Kongera"
-
-# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#: src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Kureka"
-
-#: src/gtk/misc-gtk.c:1110
-#, fuzzy
-msgid "  Yes  "
-msgstr "Yego"
-
-#: src/gtk/misc-gtk.c:1120
-#, fuzzy
-msgid "  No  "
-msgstr "Oya"
-
-#: src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 #, fuzzy
 msgid "Getting directory listings"
 msgstr "bushyinguro"
 
 # basctl/source\basicide\basidesh.src:RID_BASICIDE_OBJECTBAR.SID_BASICSTOP.text
-#: src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 #, fuzzy
 msgid "  Stop  "
 msgstr "Guhagarara"
 
-#: src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, fuzzy, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr "Idosiye"
 
-#: src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, fuzzy, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Gushaka IDOSIYE in Cyangwa"
 
-#: src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr ""
 
-#: src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr ""
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
-#: src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Ubwoko"
-
-# sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
-#: src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 #, fuzzy
 msgid "_Type:"
 msgstr "Ubwoko"
 
-#: src/gtk/options_dialog.c:1017 src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Urubuga"
 
-#: src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr ""
-
-#: src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 #, fuzzy
 msgid "_Network address:"
 msgstr "Aderesi"
 
-#: src/gtk/options_dialog.c:1091 src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr ""
-
-#: src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 #, fuzzy
 msgid "_Domain:"
 msgstr "Urubuga:"
 
-#: src/gtk/options_dialog.c:1250
-msgid "Local Hosts"
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
 msgstr ""
 
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: src/gtk/options_dialog.c:1291 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Kwandika"
-
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EDIT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLEDIT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_EDIT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_EDIT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_EDIT.text
-#: src/gtk/options_dialog.c:1293
-#, fuzzy
-msgid "_Edit"
-msgstr "Guhindura"
+#: src/gtk/options_dialog.c:1139
+msgid "Local Hosts"
+msgstr ""
 
 # basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text
-#: src/gtk/options_dialog.c:1370 src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Amahitamo"
 
@@ -3223,7 +3148,7 @@ msgid "Receiving file names..."
 msgstr "IDOSIYE Amazina"
 
 # sw/source\ui\app\app.src:STR_STATSTR_LAYOUTINIT.text
-#: src/gtk/transfer.c:63 src/gtk/transfer.c:681
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Kwihuza..."
 
@@ -3232,32 +3157,32 @@ msgstr "Kwihuza..."
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Kuri a"
 
-#: src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:358
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/gtk/transfer.c:362
+#: src/gtk/transfer.c:352
 #, fuzzy, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "OYA"
 
-#: src/gtk/transfer.c:372
+#: src/gtk/transfer.c:368
 #, fuzzy, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Kubona Ibisobanuro Ibyerekeye IDOSIYE"
 
-#: src/gtk/transfer.c:377
+#: src/gtk/transfer.c:374
 #, fuzzy, c-format
 msgid "File %s was not changed\n"
 msgstr "Idosiye OYA"
 
-#: src/gtk/transfer.c:385
+#: src/gtk/transfer.c:382
 #, fuzzy, c-format
 msgid ""
 "File %s has changed.\n"
@@ -3265,61 +3190,56 @@ msgid ""
 msgstr "Idosiye Byahinduwe nka Kuri"
 
 # sfx2/sdi\sfxslots.src:SID_EDITDOC.text
-#: src/gtk/transfer.c:388
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Guhindura Idosiye"
 
 # wizards/source\importwizard\importwi.src:sReady.text
-#: src/gtk/transfer.c:453
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Byarangiye"
 
-#: src/gtk/transfer.c:493
-#, fuzzy, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "i Bya"
-
-#: src/gtk/transfer.c:727
-#, fuzzy, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
-msgstr "Ijanisha Byuzuye Idosiye Bya"
-
-#: src/gtk/transfer.c:731
+#: src/gtk/transfer.c:734
 #, fuzzy, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%%Byuzuye Igihe Idosiye Bya"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Bya ku S Igihe"
 
-#: src/gtk/transfer.c:761
+#: src/gtk/transfer.c:739
 #, fuzzy, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Bya ku S Igihe"
 
-#: src/gtk/transfer.c:770
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Bya Kitazwi Igihe"
+
+#: src/gtk/transfer.c:756
 #, fuzzy, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Bya Kitazwi Igihe"
 
-#: src/gtk/transfer.c:805
+#: src/gtk/transfer.c:800
+#, fuzzy, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr "Ijanisha Byuzuye Idosiye Bya"
+
+#: src/gtk/transfer.c:804
+#, fuzzy, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr "%d%%Byuzuye Igihe Idosiye Bya"
+
+#: src/gtk/transfer.c:842
 #, fuzzy, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "IDOSIYE Amazina Bayite"
 
-#: src/gtk/transfer.c:884 src/gtk/transfer.c:906 src/gtk/transfer.c:940
-#: src/gtk/transfer.c:980 src/gtk/transfer.c:1033 src/gtk/transfer.c:1093
+#: 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
 #, fuzzy
 msgid "There are no file transfers selected\n"
 msgstr "Oya IDOSIYE"
 
-#: src/gtk/transfer.c:924
-#, fuzzy, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "i ku Ubuturo"
-
-#: src/gtk/transfer.c:965 src/gtk/transfer.c:1018
-#, fuzzy, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "IDOSIYE ku Ubuturo"
-
 # #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.5.text
 # #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
@@ -3332,63 +3252,184 @@ msgstr "IDOSIYE ku Ubuturo"
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.3.text
 # #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.3.text
-#: src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Igaragaza"
 
-#: src/gtk/view_dialog.c:48
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Kwandika"
+
+#: src/gtk/view_dialog.c:49
 #, fuzzy, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "ni a bushyinguro Kureba"
 
-#: src/gtk/view_dialog.c:114
-#, fuzzy
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Muhinduzi in i Amahitamo"
-
-#: src/gtk/view_dialog.c:127
+#: src/gtk/view_dialog.c:52
 #, fuzzy, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "ni a bushyinguro Guhindura"
 
-#: src/gtk/view_dialog.c:210
+#: src/gtk/view_dialog.c:123
+#, fuzzy
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "Muhinduzi in i Amahitamo"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:213
+#: src/gtk/view_dialog.c:180
 #, fuzzy, c-format
 msgid "Running program: %s %s\n"
 msgstr "Porogaramu"
 
-#: src/gtk/view_dialog.c:271
+#: src/gtk/view_dialog.c:238
 #, fuzzy, c-format
 msgid "Opening %s with %s\n"
 msgstr "Na:"
 
-#: src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, fuzzy, c-format
 msgid "Viewing file %s\n"
 msgstr "IDOSIYE"
 
-#: src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, fuzzy, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Gufungura IDOSIYE"
 
-#: src/text/gftp-text.c:176
+#: src/text/gftp-text.c:166
 #, fuzzy, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Gufungura"
 
-#: src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr ""
 
-#: src/text/textui.c:143
+#: src/text/textui.c:158
 #, fuzzy, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr "%sisanzwemo."
+
+#, fuzzy
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Mburabuzi bushyinguro Gyayo Kuri ku"
+
+#, fuzzy
+#~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+#~ msgstr "Guhindura.... Ikurikiranyanyuguti Kuri 8 Bivuye KIGEZWEHO Umwanya"
+
+#, fuzzy
+#~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+#~ msgstr "Guhindura.... Ikurikiranyanyuguti Kuri KIGEZWEHO Umwanya Bivuye 8"
+
+#, fuzzy
+#~ 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 ""
+#~ ">.Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ "."
+
+#, fuzzy
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr "Ipaji Byatandukanye Nyuma Kuri"
+
+#, fuzzy
+#~ msgid "There was an error transfering the file %s"
+#~ msgstr "Ikosa i IDOSIYE"
+
+# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
+#, fuzzy
+#~ msgid "  Cancel  "
+#~ msgstr "Kureka"
+
+# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.TBX_SUBSTNEWDEL.BT_SUBSTAPPLY.text
+#~ msgid "Apply"
+#~ msgstr "Gukurikiza"
+
+#, fuzzy
+#~ msgid "Connect via URL"
+#~ msgstr "Biturutse"
+
+#, fuzzy
+#~ msgid "Host: "
+#~ msgstr "Inturo:"
+
+#, fuzzy
+#~ msgid "User: "
+#~ msgstr "Ukoresha:"
+
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_CLOSE.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\macrodlg.src:RID_STR_CLOSE.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
+#, fuzzy
+#~ msgid "  Close  "
+#~ msgstr "Gufunga"
+
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\miscdlgs.src:RID_SCDLG_COL_OPT.FT_LABEL.text
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\miscdlgs.src:RID_SCDLG_ROW_OPT.FT_LABEL.text
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\scstring.src:STR_OPT_ROWHEIGHT.text
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\scstring.src:STR_OPT_COLWIDTH.text
+#~ msgid "Add"
+#~ msgstr "Kongera"
+
+# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
+#~ msgid "Cancel"
+#~ msgstr "Kureka"
+
+#, fuzzy
+#~ msgid "  Yes  "
+#~ msgstr "Yego"
+
+#, fuzzy
+#~ msgid "  No  "
+#~ msgstr "Oya"
+
+# sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
+#~ msgid "Type:"
+#~ msgstr "Ubwoko"
+
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EDIT.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLEDIT.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_EDIT.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_EDIT.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_EDIT.text
+#, fuzzy
+#~ msgid "_Edit"
+#~ msgstr "Guhindura"
+
+#, fuzzy
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "i Bya"
diff --git a/po/sk.po b/po/sk.po
index a937678..53ef7b9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2003
 # This file is distributed under the same license as the gFTP package.
 # Pavel Kanzelsberger <kanzels boxnetwork sk>, 2003.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: gFTP\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-28 20:18+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2003-09-29 15:18+0100\n"
 "Last-Translator: Pavel Kanzelsberger <kanzels boxnetwork sk>\n"
 "Language-Team: Slovak <sk-i18n lists linux sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Nesprávne URL %s\n"
@@ -25,279 +25,366 @@ msgstr "Nesprávne URL %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Chyba: Nesprávny riadok %s v cache index súbore\n"
 
-#: lib/cache.c:136 lib/local.c:534
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Chyba: Nepodarilo sa vytvoriť adresár %s: %s\n"
 
-#: lib/cache.c:160
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Chyba: Nepodarilo sa vytvoriť dočasný súbor: %s\n"
 
-#: lib/cache.c:182 lib/cache.c:231 lib/local.c:98 lib/local.c:213
-#: lib/misc.c:292 lib/misc.c:298 lib/rfc2068.c:263 lib/sshv2.c:997
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Chyba pri zatváraní popisovača súboru: %s\n"
 
-#: lib/cache.c:249 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 "Chyba: Nepodaril sa presun v súbore %s: %s\n"
 
-#: lib/config_file.c:120 lib/config_file.c:672
+#: lib/charset-conv.c:71
+#, 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:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr "Chyba: Nemôžem otvoriť lokálny súbor %s: %s\n"
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr "Chyba: Nepodarilo sa zapísať do soketu: %s\n"
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr "Chyba: Nepodarilo sa čítať zo soketu: %s\n"
+
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Chyba: Nesprávny názov súboru pre záložky %s\n"
 
-#: lib/config_file.c:129
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Upozornenie: Nemôžem nájsť hlavný súbor so záložkami %s\n"
 
-#: lib/config_file.c:140 lib/config_file.c:678
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP Chyba: Nemôžem otvoriť súbor so záložkami %s: %s\n"
 
-#: lib/config_file.c:229 lib/config_file.c:251
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Upozornenie: Vynechávam riadok %d v súbore so záložkami: %s\n"
 
-#: lib/config_file.c:281
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Upozornenie: Riadok %d nemá dostatočný počet parametrov\n"
 
-#: lib/config_file.c:442
+#: 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 ""
 
-#: lib/config_file.c:445
+#: 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:523 lib/config_file.c:750
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Chyba: Chybný názov súboru s konfiguráciou %s\n"
 
-#: lib/config_file.c:534
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP Chyba: Nepodarilo sa vytvoriť adresár %s: %s\n"
 
-#: lib/config_file.c:544
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP Chyba: Nemôžem nájsť hlavný konfiguračný súbor %s\n"
 
-#: lib/config_file.c:546
+#: lib/config_file.c:610
+#, c-format
 msgid "Did you do a make install?\n"
 msgstr "Vykonali ste make install?\n"
 
-#: lib/config_file.c:555 lib/config_file.c:756
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP Chyba: Nemôžem otvoriť konfiguračný súbor %s: %s\n"
 
-#: lib/config_file.c:594
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
-msgstr "Koniec programu kvôli chybám pri čítaní na riadku %d v konfiguračnom súbore\n"
+msgstr ""
+"Koniec programu kvôli chybám pri čítaní na riadku %d v konfiguračnom súbore\n"
 
-#: lib/config_file.c:600
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP Upozornenie: Vynechávam riadok %d v konfiguračnom súbore: %s\n"
 
-#: lib/config_file.c:607
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP Chyba: Nesprávny názov súboru pre log %s\n"
 
-#: lib/config_file.c:613
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Upozornenie: Nemôžem otvoriť %s pre zápis: %s\n"
 
-#: lib/config_file.c:668
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Súbor záložiek pre gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
-"prg>. Upozornenie: Akékoľvek komentáre, ktoré pridáte do tohoto súboru budú prepísané"
+"prg>. Upozornenie: Akékoľvek komentáre, ktoré pridáte do tohoto súboru budú "
+"prepísané"
 
-#: lib/config_file.c:763
+#: lib/config_file.c:733
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+
+#: lib/config_file.c:845
+#, fuzzy
+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 ""
-"Konfiguračný súbor pre gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
-"org>. Upozornenie: Akékoľvek komentáre, ktoré pridáte do tohoto súboru budú prepísané. "
-"Ak má záznam (*) v poznámke, nebudete ho môcť zmeniť priamo v gFTP"
+"Konfiguračný súbor pre gFTP. Copyright (C) 1998-2003 Brian Masney "
+"<masneyb gftp org>. Upozornenie: Akékoľvek komentáre, ktoré pridáte do "
+"tohoto súboru budú prepísané. Ak má záznam (*) v poznámke, nebudete ho môcť "
+"zmeniť priamo v gFTP"
 
-#: lib/config_file.c:1122 lib/rfc2068.c:557 lib/rfc2068.c:558
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<neznámy>"
 
-#: lib/config_file.c:1198 lib/config_file.c:1259 lib/config_file.c:1300
-#: lib/config_file.c:1332
+#: 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 ""
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Podpora HTTPS nie je dostupná pretože podpora SSL nebola skompilovaná. Ukončujem "
-"spojenie.\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Chyba: Nemôžem otvoriť lokálny súbor %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Nemôžem zmeniť lokálny adresár na %s: %s\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Chyba: Nepodaril sa presun v súbore %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Nepodarilo sa zistiť aktuálny pracovný adresár: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Chyba pri zatváraní popisovača súboru: %s\n"
 
-#: lib/local.c:179
+#: lib/fsp.c:327
 #, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Chyba: Nepodarilo sa skrátiť lokálny súbor %s: %s\n"
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr ""
 
-#: lib/local.c:404
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
+#: 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 "neznámy"
+
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Nepodarilo sa zistiť zoznam súborov v lokálnom adresári %s: %s\n"
 
-#: lib/local.c:441
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "Úspešne zmenený lokálny adresár na %s\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:914
-#: src/gtk/view_dialog.c:301
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Nemôžem zmeniť lokálny adresár na %s: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Úspešne odstránené %s\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Chyba: Nepodarilo sa odstrániť adresár %s: %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:918 src/gtk/view_dialog.c:305
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Chyba: Nepodarilo sa odstrániť súbor %s: %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Úspešne vytvorený adresár %s\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Úspešne premenované z %s na %s\n"
 
-#: lib/local.c:560
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Chyba: Nepodarilo sa premenovať %s na %s: %s\n"
 
-#: lib/local.c:583
-#, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "Úspešne zmenený mód %s na %d\n"
+#: lib/ftps.c:156
+#, fuzzy
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podpora HTTPS nie je dostupná pretože podpora SSL nebola skompilovaná. "
+"Ukončujem spojenie.\n"
 
-#: lib/local.c:590
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podpora HTTPS nie je dostupná pretože podpora SSL nebola skompilovaná. "
+"Ukončujem spojenie.\n"
+
+#: lib/local.c:66
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
-msgstr "Chyba: Nepodarilo sa zmeniť mód %s na %d: %s\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "Nepodarilo sa zistiť aktuálny pracovný adresár: %s\n"
 
-#: lib/local.c:682
-msgid "local filesystem"
-msgstr "lokálny systém súborov"
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Úspešne zmenený lokálny adresár na %s\n"
 
-#: lib/misc.c:261 lib/misc.c:268 lib/protocols.c:2519
+#: lib/local.c:112
 #, c-format
-msgid "Error: Cannot open local file %s: %s\n"
-msgstr "Chyba: Nemôžem otvoriť lokálny súbor %s: %s\n"
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Nemôžem zmeniť lokálny adresár na %s: %s\n"
 
-#: lib/misc.c:278 lib/protocols.c:2237 lib/sslcommon.c:467
+#: lib/local.c:238
 #, c-format
-msgid "Error: Could not write to socket: %s\n"
-msgstr "Chyba: Nepodarilo sa zapísať do soketu: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Chyba: Nepodarilo sa skrátiť lokálny súbor %s: %s\n"
 
-#: lib/misc.c:286 lib/protocols.c:2165 lib/sslcommon.c:421
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not read from socket: %s\n"
-msgstr "Chyba: Nepodarilo sa čítať zo soketu: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Nepodarilo sa zistiť zoznam súborov v lokálnom adresári %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Úspešne zmenený mód %s na %d\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Chyba: Nepodarilo sa zmeniť mód %s na %d: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Úspešne zmenený mód %s na %d\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Chyba: Nepodarilo sa zmeniť mód %s na %d: %s\n"
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr "lokálny systém súborov"
 
-#: lib/misc.c:442
-msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
-msgstr "použitie: gftp [[protokol://][používateľ[:heslo] ]server[:port][/adresár]]\n"
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr ""
 
-#: lib/options.h:24 lib/rfc959.c:24
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "žiadny"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "súbor"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "veľkosť"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "používateľ"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "skupina"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atribúty"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "vzostupne"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "zostupne"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Hlavné"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Zobrazovací program:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -305,35 +392,27 @@ msgstr ""
 "Štandardný program na prezeranie súborov. Ak ho nezadáte, bude na prezeranie "
 "použitý interný program"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Editor:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Štandardný program určený na úpravu súborov."
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Štartovací Adresár:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Štandardný adresár v ktorom gFTP začne pracovať po štarte"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Max. veľkosť okna logu:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maximálna veľkosť okna logu v bajtoch pre port GTK+"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Vzdialené sady znakov:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -341,118 +420,207 @@ msgstr ""
 "Toto je zoznam znakových sád oddelených čiarkov, ktoré sa použijú na "
 "konveriu vzdialených správ do aktuálneho prostredia"
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL vyr. pamäť:"
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
-msgstr "Počet sekúnd počas ktorých udržiavať záznamy vo vyrovnávacej pamäti až kým neexpirujú."
+msgstr ""
+"Počet sekúnd počas ktorých udržiavať záznamy vo vyrovnávacej pamäti až kým "
+"neexpirujú."
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Prilepiť prenesené súbory"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Prilepiť novo prenesené súbory do existujúcich"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Používať len jeden prenos naraz"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Naozaj používať len jeden prenos naraz?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Štandardne prepísať"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Štandardne prepisovať súbory alebo obnoviť prenos súboru"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Dodržať práva súboru"
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
+msgstr "Dodržiavať práva prenášaných súborov"
+
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "Dodržať práva súboru"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Dodržiavať práva prenášaných súborov"
 
-#: lib/options.h:75
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Obnoviť po každom prenesenom súbore"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Obnovovať zoznam súborov po každom prenesenom súbore"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Triediť adresáre ako prvé"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Najprv zobrazovať adresáre a až potom súbory"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Zobraziť skryté súbory"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Zobrazovať skryté súbory v zozname súborov"
 
-#: lib/options.h:89 src/gtk/options_dialog.c:1048
-#: src/gtk/options_dialog.c:1141
+#: lib/options.h:100
+#, fuzzy
+msgid "Show transfer status in title"
+msgstr "Používať len jeden prenos naraz"
+
+#: lib/options.h:102
+#, fuzzy
+msgid "Show the file transfer status in the titlebar"
+msgstr "Zobrazovať skryté súbory v zozname súborov"
+
+#: lib/options.h:103
+#, fuzzy
+msgid "Start file transfers"
+msgstr "Pasívny prenos súborov"
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr ""
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Zapamätať heslo"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Sieť"
 
-#: lib/options.h:91
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Timeout sieťe:"
 
-#: lib/options.h:94
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
-"Čas počas ktorého sa čaká na vstupné/výstupné dáta. Nie je to čas pri nečinnosti."
+"Čas počas ktorého sa čaká na vstupné/výstupné dáta. Nie je to čas pri "
+"nečinnosti."
 
-#: lib/options.h:96
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Opakovať pripojenie:"
 
-#: lib/options.h:99
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
-msgstr "Počet automatických pokusov o znovapripojenie sa. Nastavte na 0 pre neobmedzený počet"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
+msgstr ""
+"Počet automatických pokusov o znovapripojenie sa. Nastavte na 0 pre "
+"neobmedzený počet"
 
-#: lib/options.h:101
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr ""
 
-#: lib/options.h:104
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr ""
 
-#: lib/options.h:105
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/S"
 
-#: lib/options.h:108
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
-msgstr "Maximálny počet KB/S pre prenos súboru. (Nastavte 0 ak nechcete obmedzenie)"
+msgstr ""
+"Maximálny počet KB/S pre prenos súboru. (Nastavte 0 ak nechcete obmedzenie)"
 
-#: lib/options.h:111
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr ""
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Štandardný Protokol:"
 
-#: lib/options.h:113
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Definícia štandardného protokolu, ktorý sa má používať"
 
-#: lib/options.h:117
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr ""
+
+#: lib/options.h:159
 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"
@@ -460,270 +628,246 @@ msgstr ""
 "Tu definujete čo sa má udiať po dvojkliknutí na súbor v zozname súborov. "
 "0=Prezerať súbor 1=Upraviť súbor 2=Preniesť súbor"
 
-#: lib/options.h:120
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Štandardná šírka zoznamu lokálnych súborov"
 
-#: lib/options.h:123
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Štandardná šírka zoznamu vzdialených súborov"
 
-#: lib/options.h:126
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Štandardná výška zoznamu lokálnych/vzdialených súborov"
 
-#: lib/options.h:129
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Štandardná výška okna s prenosmi súborov"
 
-#: lib/options.h:132
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Štandardná výška okna s logom"
 
-#: lib/options.h:135
+#: 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 ""
-"Šírka stĺpca pre názov súboru v okne s prenosmi súborov. Nastavte 0 ak chcete "
-"aby sa táto šírka upravovala automaticky."
+"Šírka stĺpca pre názov súboru v okne s prenosmi súborov. Nastavte 0 ak "
+"chcete aby sa táto šírka upravovala automaticky."
 
-#: lib/options.h:139 lib/options.h:145
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Štandardný stĺpec podľa ktorého sa triedia položky"
 
-#: lib/options.h:142 lib/options.h:148
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Zostupné alebo vzostupné triedenie"
 
-#: lib/options.h:152 lib/options.h:170
+#: lib/options.h:203 lib/options.h:221
 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 ""
 
-#: lib/options.h:155 lib/options.h:173
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:158 lib/options.h:176
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:161 lib/options.h:179
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 
-#: lib/options.h:188
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Farba príkazov ktoré sa posielajú na server"
 
-#: lib/options.h:191
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Farba príkazov ktoré prichádzajú zo servera"
 
-#: lib/options.h:194
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Farba chybových hlásení"
 
-#: lib/options.h:197
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Farba zostávajúcich správ v logu"
 
-#: lib/options.h:203 lib/rfc959.c:38
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:204 lib/rfc2068.c:27
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr ""
+
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:206 lib/options.h:208
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:210
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokálny"
 
-#: lib/options.h:211
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:212 src/gtk/bookmarks.c:860
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: lib/protocols.c:168 lib/protocols.c:193
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr ""
 
-#: lib/protocols.c:322
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: lib/protocols.c:467
+#: lib/protocols.c:390
 #, c-format
-msgid "Error: Cannot write to cache: %s\n"
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:499
+#: lib/protocols.c:400
 #, c-format
-msgid "Error: Could not find bookmark %s\n"
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr ""
 
-#: lib/protocols.c:506
+#: lib/protocols.c:450
 #, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#: lib/protocols.c:614
-#, c-format
-msgid "The protocol '%s' is currently not supported.\n"
-msgstr "Protokol '%s' zatiaľ nie je podporovaný.\n"
-
-#: lib/protocols.c:931 lib/protocols.c:946 lib/protocols.c:1762
-#: lib/protocols.c:1871
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Vyhľadávam %s\n"
-
-#: lib/protocols.c:937 lib/protocols.c:952 lib/protocols.c:1767
-#: lib/protocols.c:1876
+#: lib/protocols.c:481
 #, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Nepodarilo sa zistiť adresu hostiteľa %s: %s\n"
-
-#: lib/protocols.c:1209 lib/protocols.c:1210 lib/protocols.c:1269
-#: lib/protocols.c:1276 lib/protocols.c:1355 lib/protocols.c:1356
-#: lib/protocols.c:1390
-msgid "unknown"
-msgstr "neznámy"
-
-#: lib/protocols.c:1785 lib/protocols.c:1828 lib/rfc959.c:589 lib/rfc959.c:736
-#, c-format
-msgid "Failed to create a socket: %s\n"
+msgid "Error: Cannot write to cache: %s\n"
 msgstr ""
 
-#: lib/protocols.c:1791 lib/protocols.c:1890
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Skúšam %s:%d\n"
-
-#: lib/protocols.c:1796 lib/protocols.c:1897
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Nepodarilo sa pripojiť na %s: %s\n"
-
-#: lib/protocols.c:1852 lib/sshv2.c:895
+#: lib/protocols.c:514
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Could not find bookmark %s\n"
 msgstr ""
 
-#: lib/protocols.c:1914 lib/protocols.c:2528 lib/rfc959.c:598 lib/rfc959.c:745
+#: lib/protocols.c:521
 #, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr ""
 
-#: lib/protocols.c:1921
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Pripojený na %s:%d\n"
+msgid "The protocol '%s' is currently not supported.\n"
+msgstr "Protokol '%s' zatiaľ nie je podporovaný.\n"
 
-#: lib/protocols.c:2145 lib/protocols.c:2216
+#: lib/protocols.c:1153
 #, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Pripojenie na %s vypršalo\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:2285
+#: lib/protocols.c:1531
 #, c-format
-msgid "Cannot get socket flags: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
+"Chyba: Vzdialený hostiteľ %s odpojený. Max. počet pokusov dosiahnutý..."
+"vzdávam sa\n"
 
-#: lib/protocols.c:2299
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 
-#: lib/protocols.c:2425
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
 #, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "Chyba: Vzdialený hostiteľ %s odpojený. Max. počet pokusov dosiahnutý...vzdávam sa\n"
+msgid "Error: Cannot set close on exec flag: %s\n"
+msgstr ""
 
-#: lib/protocols.c:2433
+#: lib/pty.c:301
 #, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgid "Cannot open master pty %s: %s\n"
 msgstr ""
 
-#: lib/pty.c:288
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr ""
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr ""
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr ""
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr ""
-
-#: lib/rfc2068.c:30 lib/rfc959.c:45
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxy server:"
 
-#: lib/rfc2068.c:32 lib/rfc959.c:47
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Firewall hostiteľ"
 
-#: lib/rfc2068.c:33 lib/rfc959.c:48
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy port:"
 
-#: lib/rfc2068.c:35 lib/rfc959.c:50
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr ""
 
-#: lib/rfc2068.c:36 lib/rfc959.c:51
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxy používateľ:"
 
-#: lib/rfc2068.c:38 lib/rfc959.c:53
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr ""
 
-#: lib/rfc2068.c:39 lib/rfc959.c:54
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxy heslo:"
 
-#: lib/rfc2068.c:41 lib/rfc959.c:56
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr ""
 
@@ -735,106 +879,91 @@ msgstr "Používať HTTP/1.1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr ""
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:835
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:258 lib/rfc959.c:559 lib/sshv2.c:992
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Odpájam sa od hostiteľa %s\n"
 
-#: lib/rfc2068.c:309
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "Spúšťam prenos súboru na pozícii %lld\n"
-
-#: lib/rfc2068.c:317
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "Spúšťam prenos súboru na pozícii %ld\n"
 
-#: lib/rfc2068.c:339
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Nepodarilo sa preniesť súbor %s\n"
 
-#: lib/rfc2068.c:429 lib/sshv2.c:1077
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Prenášam zoznam súborov v adresári...\n"
 
-#: lib/rfc2068.c:816
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed before the chunk size in the "
-"server response\n"
-msgstr ""
-
-#: lib/rfc2068.c:824
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Expecting a carriage return and line feed after the chunk size in the server "
-"response\n"
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
 msgstr ""
 
-#: lib/rfc959.c:25
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr ""
 
-#: lib/rfc959.c:26
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "používateľ hostiteľ"
 
-#: lib/rfc959.c:27
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "používateľ hostiteľ:port"
 
-#: lib/rfc959.c:28
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr ""
 
-#: lib/rfc959.c:29
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "používateľ hostiteľ port"
 
-#: lib/rfc959.c:30
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "používateľ hostiteľ NOAUTH"
 
-#: lib/rfc959.c:31
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: lib/rfc959.c:32
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Vlastné"
 
-#: lib/rfc959.c:41
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Email adresa:"
 
-#: lib/rfc959.c:43
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
 
-#: lib/rfc959.c:57
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxy konto:"
 
-#: lib/rfc959.c:59
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr ""
 
-#: lib/rfc959.c:61
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Typ proxy servera:"
 
-#: lib/rfc959.c:64
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -845,11 +974,23 @@ msgid ""
 "can you type in %pu"
 msgstr ""
 
-#: lib/rfc959.c:67
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasívny prenos súborov"
 
-#: lib/rfc959.c:70
+#: 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. "
@@ -859,11 +1000,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: lib/rfc959.c:75
+#: 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 "
@@ -871,78 +1012,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Prenášať súbory v ASCII móde"
 
-#: lib/rfc959.c:80
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:307 lib/rfc959.c:316 lib/rfc959.c:327
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
+#, c-format
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
+msgid "Failed to create a IPv4 socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:627 lib/rfc959.c:637
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:652 lib/rfc959.c:807
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr ""
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:664 lib/rfc959.c:685 lib/rfc959.c:832
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:675 lib/rfc959.c:822
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:694 lib/rfc959.c:841
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:756
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr ""
+
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:785 lib/rfc959.c:794
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:851
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:923
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr ""
 
-#: lib/rfc959.c:1422
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "spolu"
 
-#: lib/rfc959.c:1424
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr ""
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Vyhľadávam %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 "Nepodarilo sa zistiť adresu hostiteľa %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr ""
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Skúšam %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 "Nepodarilo sa pripojiť na %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Pripojený na %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 ""
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Pripojenie na %s vypršalo\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr ""
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr ""
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr ""
@@ -963,206 +1170,190 @@ msgstr ""
 msgid "Extra parameters to pass to the SSH program"
 msgstr ""
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
+#: lib/sshv2.c:38
+msgid "Need SSH User/Pass"
 msgstr ""
 
 #: lib/sshv2.c:41
-msgid "Need SSH User/Pass"
+msgid "Require a username/password for SSH connections"
 msgstr ""
 
-#: lib/sshv2.c:44
-msgid "Require a username/password for SSH connections"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
 msgstr ""
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
 msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Heslo:"
+
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Heslo:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
 
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
 
-#: lib/sshv2.c:257
-#, c-format
-msgid "Running program %s\n"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
 msgstr ""
 
-#: lib/sshv2.c:304 lib/sshv2.c:329
-msgid "WARNING"
-msgstr "UPOZORNENIE"
+#: lib/sshv2.c:519
+msgid "Enter SecurID Password:"
+msgstr ""
 
-#: lib/sshv2.c:371
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Chyba: Bolo zadané nesprávne heslo\n"
 
-#: lib/sshv2.c:374
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
-msgstr ""
-
-#: lib/sshv2.c:377
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr ""
-
-#: lib/sshv2.c:416
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: lib/sshv2.c:422
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: lib/sshv2.c:431
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: lib/sshv2.c:436
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr ""
 
-#: lib/sshv2.c:442
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:447
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr ""
 
-#: lib/sshv2.c:451
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr ""
 
-#: lib/sshv2.c:456
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:461
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr ""
 
-#: lib/sshv2.c:466
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: lib/sshv2.c:471
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: lib/sshv2.c:475
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: lib/sshv2.c:492
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: lib/sshv2.c:497
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: lib/sshv2.c:510 src/gtk/bookmarks.c:1019 src/gtk/bookmarks.c:1256
-#: src/gtk/chmod_dialog.c:281 src/gtk/options_dialog.c:1106
-#: src/gtk/options_dialog.c:1308 src/gtk/transfer.c:2053
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr ""
 
-#: lib/sshv2.c:513
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: lib/sshv2.c:516
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Súbor alebo adresár neexistuje"
 
-#: lib/sshv2.c:519
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Prístup odmietnutý"
 
-#: lib/sshv2.c:522
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Zlyhanie"
 
-#: lib/sshv2.c:525
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Zlá správa"
 
-#: lib/sshv2.c:528
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nie je spojenie"
 
-#: lib/sshv2.c:531
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Spojenie sa stratilo"
 
-#: lib/sshv2.c:534
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Nepodporovaná operácia"
 
-#: lib/sshv2.c:537
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Server vrátil nerozpoznanú správu"
 
-#: lib/sshv2.c:574
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr ""
 
-#: lib/sshv2.c:632 lib/sshv2.c:1116 lib/sshv2.c:1951 lib/sshv2.c:2044
-#: lib/sshv2.c:2132
+#: 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 ""
 
-#: lib/sshv2.c:638
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:714 lib/sshv2.c:727 lib/sshv2.c:749 lib/sshv2.c:817
-#: lib/sshv2.c:948 lib/sshv2.c:1039 lib/sshv2.c:1107 lib/sshv2.c:1220
-#: lib/sshv2.c:1233 lib/sshv2.c:1246 lib/sshv2.c:1259 lib/sshv2.c:1315
-#: lib/sshv2.c:1380 lib/sshv2.c:1840 lib/sshv2.c:1942 lib/sshv2.c:2035
-#: lib/sshv2.c:2120 lib/sshv2.c:2205
-msgid "Received wrong response from server, disconnecting\n"
-msgstr ""
-
-#: lib/sshv2.c:866
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Otváram SSH pripojenie na %s\n"
 
-#: lib/sshv2.c:959
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Úspešne prihlásený na SSH server %s\n"
@@ -1187,7 +1378,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1196,1457 +1391,1590 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:912 src/gtk/menu-items.c:58
-#: src/gtk/menu-items.c:88 src/gtk/misc-gtk.c:483 src/gtk/misc-gtk.c:491
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr "Operácia prerušená\n"
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr ""
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "Preklad"
+
+#: 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 ""
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr ""
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr ""
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr ""
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr ""
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr ""
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr ""
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr ""
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr ""
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr ""
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr ""
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr ""
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr ""
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr ""
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr ""
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr ""
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr ""
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr ""
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr ""
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr ""
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr ""
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr ""
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr ""
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr ""
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr ""
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 
-#: src/gtk/bookmarks.c:40
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Spustiť záložku"
 
-#: src/gtk/bookmarks.c:70
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Pridanie záložky: Musíte zadať meno záložky\n"
 
-#: src/gtk/bookmarks.c:77
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "Pridanie záložky: Nemôžem pridať záložku %s pretože také meno už existuje\n"
+msgstr ""
+"Pridanie záložky: Nemôžem pridať záložku %s pretože také meno už existuje\n"
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Pridať záložku"
 
-#: src/gtk/bookmarks.c:141
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Pridať záložku: Musíte zadať meno hostiteľa\n"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
 "(ex: Linux Sites/Debian)"
 msgstr ""
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Zapamätať heslo"
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Pridanie záložky: Musíte zadať meno záložky\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nový adresár"
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Zadajte názov pre adresár, ktorý chcete vytvoriť"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Súbor/Nová položka..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Zadajte názov pre položku, ktorú chcete vytvoriť"
 
-#: src/gtk/bookmarks.c:555
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
-msgstr ""
+"%s and all its children?"
+msgstr "Ste si istý, že chcete vymazať tieto %ld súbory a %ld adresáre"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Odstrániť záložku"
 
-#: src/gtk/bookmarks.c:583
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: src/gtk/bookmarks.c:825 src/gtk/bookmarks.c:828
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Upraviť položku"
 
-#: src/gtk/bookmarks.c:865
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/gtk/bookmarks.c:880
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Hostiteľ:"
 
-#: src/gtk/bookmarks.c:893
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gtk/bookmarks.c:910
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtk/bookmarks.c:934
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Vzdialený adresár:"
 
-#: src/gtk/bookmarks.c:947
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokálny adresár:"
 
-#: src/gtk/bookmarks.c:964
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Používateľ:"
 
-#: src/gtk/bookmarks.c:977
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gtk/bookmarks.c:991
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtk/bookmarks.c:1005
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Prihlásiť sa ako anonymný používateľ"
 
-#: src/gtk/bookmarks.c:1031 src/gtk/bookmarks.c:1266
-#: src/gtk/chmod_dialog.c:293 src/gtk/options_dialog.c:1117
-#: src/gtk/options_dialog.c:1319 src/gtk/transfer.c:2065
-msgid "  Cancel  "
-msgstr "  Zrušiť  "
-
-#: src/gtk/bookmarks.c:1041 src/gtk/options_dialog.c:1330
-msgid "Apply"
-msgstr "Aplikovať"
-
-#: src/gtk/bookmarks.c:1183
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/gtk/bookmarks.c:1184
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Súbor/teroff"
 
-#: src/gtk/bookmarks.c:1185
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Súbor/Nový adresár..."
 
-#: src/gtk/bookmarks.c:1186
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Súbor/Nová položka..."
 
-#: src/gtk/bookmarks.c:1187
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Súbor/Vymazať"
 
-#: src/gtk/bookmarks.c:1188
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Súbor/Vlastnosti..."
 
-#: src/gtk/bookmarks.c:1189
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Súbor/sep"
 
-#: src/gtk/bookmarks.c:1190
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Súbor/Zavrieť"
 
-#: src/gtk/bookmarks.c:1201 src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Upraviť záložky"
 
-#: src/gtk/chmod_dialog.c:73 src/gtk/delete_dialog.c:89
-#: src/gtk/menu-items.c:422 src/gtk/mkdir_dialog.c:58
-#: src/gtk/rename_dialog.c:59 src/gtk/transfer.c:540
-msgid "Operation canceled\n"
-msgstr "Operácia prerušená\n"
-
-#: src/gtk/chmod_dialog.c:159 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:600
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Používateľ"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Čítanie"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Zápis"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Spustenie"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:601
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Skupina"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Iné"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Ste si istý, že chcete vymazať tieto %ld súbory a %ld adresáre"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "Ste si istý, že chcete vymazať tieto %ld súbory a %ld adresáre"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "Ste si istý, že chcete vymazať tieto %ld súbory a %ld adresáre"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Vymazať súbory/adresáre"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1191
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gtk/dnd.c:130 src/gtk/dnd.c:222
-msgid "Drag-N-Drop"
-msgstr ""
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Pripojiť"
 
-#: src/gtk/dnd.c:234
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Prijaté URL %s\n"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Koniec"
 
-#: src/gtk/gftp-gtk.c:116
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:160
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+msgid "Open Location"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:161
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:162
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Okno 1"
 
-#: src/gtk/gftp-gtk.c:163
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Okno 2"
 
-#: src/gtk/gftp-gtk.c:164 src/gtk/gftp-gtk.c:167 src/gtk/gftp-gtk.c:170
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:165
-msgid "/FTP/Ascii"
-msgstr ""
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
+msgstr "/FTP/_Koniec"
 
-#: src/gtk/gftp-gtk.c:166
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binárne"
 
-#: src/gtk/gftp-gtk.c:168
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Možnosti..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Súbor/Vlastnosti..."
 
-#: src/gtk/gftp-gtk.c:171
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Koniec"
 
-#: src/gtk/gftp-gtk.c:172
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokálne"
 
-#: src/gtk/gftp-gtk.c:173
-msgid "/Lokálne/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:280
+#, fuzzy
+msgid "/Local/tearoff"
+msgstr "/Nástroje/tearoff"
 
-#: src/gtk/gftp-gtk.c:174
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokálne/Otvoriť _URL..."
 
-#: src/gtk/gftp-gtk.c:175
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokálne/Odpojiť"
 
-#: src/gtk/gftp-gtk.c:176 src/gtk/gftp-gtk.c:182
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokálne/sep"
 
-#: src/gtk/gftp-gtk.c:177
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokálne/Zmeniť špecifikáciu..."
 
-#: src/gtk/gftp-gtk.c:178
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokálne/Zobraziť vybrané"
 
-#: src/gtk/gftp-gtk.c:179
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokálne/Vybrať všetky"
 
-#: src/gtk/gftp-gtk.c:180
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokálne/Vybrať všetky súbory"
 
-#: src/gtk/gftp-gtk.c:181
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokálne/Zrušiť výber všetkých"
 
-#: src/gtk/gftp-gtk.c:183
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokálne/Uložiť zoznam adresárov..."
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokálne/Poslať príkaz..."
 
-#: src/gtk/gftp-gtk.c:185
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokálne/Zmeniť adresár"
 
-#: src/gtk/gftp-gtk.c:186
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Lokálne/Atribúty..."
 
-#: src/gtk/gftp-gtk.c:187
-msgid "/Local/Make Directory..."
-msgstr "/Lokálne/Vytvoriť adresár..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Súbor/Nový adresár..."
 
-#: src/gtk/gftp-gtk.c:188
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Lokálne/Premenovať..."
 
-#: src/gtk/gftp-gtk.c:189
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Lokálne/Vymazať..."
 
-#: src/gtk/gftp-gtk.c:190
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Lokálne/Upraviť..."
 
-#: src/gtk/gftp-gtk.c:191
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Lokálne/Prezrieť..."
 
-#: src/gtk/gftp-gtk.c:192
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Lokálne/Obnoviť"
 
-#: src/gtk/gftp-gtk.c:193
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Vzdialene"
 
-#: src/gtk/gftp-gtk.c:194
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/_Vzdialene/tearoff"
 
-#: src/gtk/gftp-gtk.c:195
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/_Vzdialene/Otvoriť _URL..."
 
-#: src/gtk/gftp-gtk.c:197
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/_Vzdialene/Odpojiť"
 
-#: src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:205
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/_Vzdialene/sep"
 
-#: src/gtk/gftp-gtk.c:200
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/_Vzdialene/Zmeniť špecifikáciu..."
 
-#: src/gtk/gftp-gtk.c:201
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/_Vzdialene/Zobraziť vybrané"
 
-#: src/gtk/gftp-gtk.c:202
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/_Vzdialene/Vybrať všetky"
 
-#: src/gtk/gftp-gtk.c:203
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/_Vzdialene/Vybrať všetky súbory"
 
-#: src/gtk/gftp-gtk.c:204
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/_Vzdialene/Odznačiť všetky"
 
-#: src/gtk/gftp-gtk.c:206
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/_Vzdialene/Uložiť zoznam adresárov..."
 
-#: src/gtk/gftp-gtk.c:207
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/_Vzdialene/Poslať SITE príkaz..."
 
-#: src/gtk/gftp-gtk.c:208
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/_Vzdialene/Zmeniť adresár"
 
-#: src/gtk/gftp-gtk.c:209
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/_Vzdialene/Atribúty..."
 
-#: src/gtk/gftp-gtk.c:210
-msgid "/Remote/Make Directory..."
-msgstr "/_Vzdialene/Vytvoriť adresár..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Súbor/Nový adresár..."
 
-#: src/gtk/gftp-gtk.c:211
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/_Vzdialene/Premenovať..."
 
-#: src/gtk/gftp-gtk.c:212
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/_Vzdialene/Vymazať..."
 
-#: src/gtk/gftp-gtk.c:213
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/_Vzdialene/Upraviť..."
 
-#: src/gtk/gftp-gtk.c:214
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/_Vzdialene/Prezrieť..."
 
-#: src/gtk/gftp-gtk.c:215
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/_Vzdialene/Obnoviť"
 
-#: src/gtk/gftp-gtk.c:216
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Záložky"
 
-#: src/gtk/gftp-gtk.c:217
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/_Záložky/tearoff"
 
-#: src/gtk/gftp-gtk.c:218
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/_Záložky/Pridať záložku"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/_Záložky/Upraviť záložky"
 
-#: src/gtk/gftp-gtk.c:221
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/_Záložky/sep"
 
-#: src/gtk/gftp-gtk.c:222
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Prenosy"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/_Prenosy/tearoff"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/Transfers/Start Transfer"
-msgstr "/_Prenosy/Spustiť prenos"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/_Prenosy/tearoff"
 
-#: src/gtk/gftp-gtk.c:225
-msgid "/Transfers/Stop Transfer"
-msgstr "/_Prenosy/Zastaviť prenos"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/_Prenosy/sep"
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:235
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/_Prenosy/sep"
 
-#: src/gtk/gftp-gtk.c:228
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/_Prenosy/Preskočit aktuálny súbor"
 
-#: src/gtk/gftp-gtk.c:229
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/_Prenosy/Odstrániť súbor"
 
-#: src/gtk/gftp-gtk.c:231
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/_Prenosy/Presunúť súbor _vyššie"
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/_Prenosy/Presunúť súbor _nižšie"
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/_Prenosy/Získať súbory"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/_Prenosy/Poslať súbory"
 
-#: src/gtk/gftp-gtk.c:238
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:239
-msgid "/Logging/tearoff"
-msgstr ""
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
+msgstr "/Nástroje/tearoff"
 
-#: src/gtk/gftp-gtk.c:240
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:241
-msgid "/Logging/View log..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Lokálne/Prezrieť..."
 
-#: src/gtk/gftp-gtk.c:242
-msgid "/Logging/Save log..."
-msgstr ""
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
+msgstr "/Lokálne/Premenovať..."
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Nástroje/"
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Nástroje/tearoff"
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Nástroje/Porovnať okná"
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Nástroje/Vyčistiť vyr. pamäť"
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Pomoc"
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Pomoc/tearoff"
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Pomoc/O programe..."
 
-#: src/gtk/gftp-gtk.c:367
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Hostiteľ: "
 
-#: src/gtk/gftp-gtk.c:385
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: src/gtk/gftp-gtk.c:403
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Používateľ: "
 
-#: src/gtk/gftp-gtk.c:421
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Heslo: "
 
-#: src/gtk/gftp-gtk.c:598 src/gtk/gftp-gtk.c:802 src/gtk/transfer.c:1894
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr ""
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Súbor"
 
-#: src/gtk/gftp-gtk.c:599
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/gtk/gftp-gtk.c:602
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Dátum"
 
-#: src/gtk/gftp-gtk.c:603
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atribúty"
 
-#: src/gtk/gftp-gtk.c:803
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Priebeh"
 
-#: src/gtk/gftp-gtk.c:913 src/gtk/misc-gtk.c:892 src/gtk/misc-gtk.c:963
-msgid "Connect"
-msgstr "Pripojiť"
-
-#: src/gtk/gftp-gtk.c:935
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1170
-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";
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "Obnoviť"
+
+#: src/gtk/gtkui.c:120
+#, fuzzy
+msgid "Enter Username"
+msgstr "Používateľ:"
+
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:1172 src/text/gftp-text.c:150
-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"
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
 msgstr ""
 
-#: src/gtk/menu-items.c:59 src/gtk/menu-items.c:89
-msgid "OpenURL"
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:67 src/gtk/menu-items.c:97
-msgid "OpenURL: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:119
-msgid "Connect via URL"
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
 msgstr ""
 
-#: src/gtk/menu-items.c:119
-msgid "Enter ftp url to connect to"
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
 msgstr ""
 
-#: src/gtk/menu-items.c:152
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "Premenovať"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
 msgstr ""
 
-#: src/gtk/menu-items.c:189 src/gtk/menu-items.c:192
-msgid "Change Filespec"
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
 msgstr ""
 
-#: src/gtk/menu-items.c:192
-msgid "Enter the new file specification"
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
 msgstr ""
 
-#: src/gtk/menu-items.c:220 src/gtk/menu-items.c:592 src/gtk/menu-items.c:650
-#: src/gtk/view_dialog.c:62 src/gtk/view_dialog.c:129
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
 msgstr ""
 
-#: src/gtk/menu-items.c:246
-msgid "Save Directory Listing"
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
 msgstr ""
 
-#: src/gtk/menu-items.c:363
-msgid "SITE: Operation canceled...you must enter a string\n"
+#: 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/menu-items.c:382 src/gtk/menu-items.c:385
-msgid "Site"
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
 msgstr ""
 
-#: src/gtk/menu-items.c:385
-msgid "Enter site-specific command"
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
 msgstr ""
 
-#: src/gtk/menu-items.c:484 src/gtk/menu-items.c:518
-msgid "Chdir"
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
 msgstr ""
 
-#: src/gtk/menu-items.c:616 src/gtk/menu-items.c:674
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr ""
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr ""
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
+msgstr ""
+
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
+msgstr ""
+
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr ""
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
+msgstr ""
+
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:697
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr ""
 
-#: src/gtk/menu-items.c:733
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
 
-#: src/gtk/menu-items.c:737 src/gtk/menu-items.c:742
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr ""
 
-#: src/gtk/menu-items.c:773
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 
-#: src/gtk/menu-items.c:774 src/text/gftp-text.c:390
-msgid "Translated by"
-msgstr "Preklad"
-
-#: src/gtk/menu-items.c:785
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "O"
 
-#: src/gtk/menu-items.c:834
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licenčná Zmluva"
 
-#: src/gtk/menu-items.c:840 src/gtk/view_dialog.c:377
-msgid "  Close  "
-msgstr "  Zavrieť  "
-
-#: src/gtk/menu-items.c:922
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Porovnať okná"
 
-#: src/gtk/misc-gtk.c:214
-msgid "Refresh"
-msgstr "Obnoviť"
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "Odpájam sa od hostiteľa %s\n"
 
-#: src/gtk/misc-gtk.c:303
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#: src/gtk/misc-gtk.c:310
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:324
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nie je pripojený"
 
-#: src/gtk/misc-gtk.c:410
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:499
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:506
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:514
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:889 src/gtk/misc-gtk.c:960
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Zmeniť"
 
-#: src/gtk/misc-gtk.c:895 src/gtk/misc-gtk.c:966 src/gtk/rename_dialog.c:101
-#: src/gtk/rename_dialog.c:113
-msgid "Rename"
-msgstr "Premenovať"
-
-#: src/gtk/misc-gtk.c:957 src/gtk/options_dialog.c:1177
-msgid "Add"
-msgstr "Pridať"
-
-#: src/gtk/misc-gtk.c:983
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/gtk/misc-gtk.c:1053
-msgid "  Yes  "
-msgstr "  Áno  "
-
-#: src/gtk/misc-gtk.c:1063
-msgid "  No  "
-msgstr "  Nie  "
-
-#: src/gtk/misc-gtk.c:1119
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Získavam zoznam adresárov"
 
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stop  "
 
-#: src/gtk/misc-gtk.c:1149
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1269
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:78
-msgid "Mkdir: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/mkdir_dialog.c:100
-msgid "Mkdir"
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Make Directory"
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
 msgstr ""
 
-#: src/gtk/mkdir_dialog.c:104
-msgid "Enter name of directory to create"
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:917
-msgid "Edit Host"
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
 msgstr ""
 
-#: src/gtk/options_dialog.c:917
-msgid "Add Host"
-msgstr ""
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
+msgstr "Timeout sieťe:"
 
-#: src/gtk/options_dialog.c:949 src/gtk/options_dialog.c:1040
-msgid "Domain"
+#: src/gtk/options_dialog.c:1013
+msgid "N_etmask:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:969
-msgid "Network Address"
+#: src/gtk/options_dialog.c:1056
+msgid "_Domain:"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1002 src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1148
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr ""
 
-#: src/gtk/options_dialog.c:1184 src/gtk/view_dialog.c:91
-msgid "Edit"
-msgstr ""
-
-#: src/gtk/options_dialog.c:1246 src/gtk/options_dialog.c:1251
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr ""
 
-#: src/gtk/rename_dialog.c:79
-msgid "Rename: Operation canceled...you must enter a string\n"
-msgstr ""
-
-#: src/gtk/rename_dialog.c:111
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr ""
-
-#: src/gtk/transfer.c:173
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr ""
 
-#: src/gtk/transfer.c:289
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr ""
-
-#: src/gtk/transfer.c:316 src/gtk/transfer.c:1292
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr ""
 
-#: src/gtk/transfer.c:326 src/gtk/transfer.c:1186 src/gtk/transfer.c:1197
-msgid "Enter Password"
-msgstr ""
-
-#: src/gtk/transfer.c:327 src/gtk/transfer.c:1187 src/gtk/transfer.c:1198
-msgid "Please enter your password for this site"
-msgstr ""
-
-#: src/gtk/transfer.c:417
-msgid "Transfer Files"
-msgstr ""
-
-#: src/gtk/transfer.c:425
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr ""
 
-#: src/gtk/transfer.c:652
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-
-#: src/gtk/transfer.c:709
+#: src/gtk/transfer.c:336
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:739
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:844 src/gtk/transfer.c:1078 src/gtk/transfer.c:1164
-#: src/gtk/transfer.c:1607
-msgid "Skipped"
-msgstr ""
-
-#: src/gtk/transfer.c:848 src/gtk/transfer.c:1140 src/gtk/transfer.c:1168
-msgid "Waiting..."
+msgid "Error: Child %d returned %d\n"
 msgstr ""
 
-#: src/gtk/transfer.c:991
+#: src/gtk/transfer.c:345
 #, c-format
-msgid "Error: Child %d returned %d\n"
+msgid "Child %d returned successfully\n"
 msgstr ""
 
-#: src/gtk/transfer.c:994
+#: src/gtk/transfer.c:352
 #, c-format
-msgid "Child %d returned successfully\n"
+msgid "Error: Child %d did not terminate properly\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1001
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1006
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr ""
 
-#: src/gtk/transfer.c:1014
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr ""
 
-#: src/gtk/transfer.c:1017
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr ""
 
-#: src/gtk/transfer.c:1081
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr ""
 
-#: src/gtk/transfer.c:1121
+#: src/gtk/transfer.c:734
 #, c-format
-msgid "Stopping the transfer of %s\n"
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1336
+#: src/gtk/transfer.c:739
 #, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1366
+#: src/gtk/transfer.c:750
 #, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1375
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 
-#: src/gtk/transfer.c:1401
+#: src/gtk/transfer.c:800
 #, c-format
-msgid "Retrieving file names...%s bytes"
+msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1479 src/gtk/transfer.c:1501 src/gtk/transfer.c:1535
-#: src/gtk/transfer.c:1575 src/gtk/transfer.c:1628 src/gtk/transfer.c:1687
-msgid "There are no file transfers selected\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1519
+#: src/gtk/transfer.c:804
 #, c-format
-msgid "Stopping the transfer on host %s\n"
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr ""
 
-#: src/gtk/transfer.c:1560 src/gtk/transfer.c:1613
+#: src/gtk/transfer.c:842
 #, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr ""
-
-#: src/gtk/transfer.c:1774 src/gtk/transfer.c:1979 src/gtk/transfer.c:2018
-msgid "Overwrite"
-msgstr ""
-
-#: src/gtk/transfer.c:1796 src/gtk/transfer.c:1989 src/gtk/transfer.c:2024
-msgid "Resume"
-msgstr ""
-
-#: src/gtk/transfer.c:1818 src/gtk/transfer.c:1984
-msgid "Skip"
-msgstr ""
-
-#: src/gtk/transfer.c:1895
-msgid "Local Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1896
-msgid "Remote Size"
-msgstr ""
-
-#: src/gtk/transfer.c:1897
-msgid "Action"
-msgstr ""
-
-#: src/gtk/transfer.c:1899
-msgid "Download Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1899
-msgid "Upload Files"
-msgstr ""
-
-#: src/gtk/transfer.c:1925
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-
-#: src/gtk/transfer.c:2030
-msgid "Skip File"
+msgid "Retrieving file names...%s bytes"
 msgstr ""
 
-#: src/gtk/transfer.c:2040
-msgid "Select All"
+#: 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 ""
 
-#: src/gtk/transfer.c:2046
-msgid "Deselect All"
+#: src/gtk/view_dialog.c:34
+msgid "View"
 msgstr ""
 
-#: src/gtk/view_dialog.c:35
-msgid "View"
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
 msgstr ""
 
-#: src/gtk/view_dialog.c:47
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:100
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr ""
-
-#: src/gtk/view_dialog.c:113
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:184
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:187
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:244
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:279
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr ""
 
-#: src/gtk/view_dialog.c:286
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:29
-msgid "about"
-msgstr ""
-
-#: src/text/gftp-text.c:30
-msgid "Shows gFTP information"
-msgstr ""
-
-#: src/text/gftp-text.c:31
-msgid "ascii"
-msgstr ""
-
-#: src/text/gftp-text.c:32
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:33
-msgid "binary"
-msgstr ""
-
-#: src/text/gftp-text.c:34
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr ""
-
-#: src/text/gftp-text.c:35
-msgid "cd"
-msgstr ""
-
-#: src/text/gftp-text.c:36 src/text/gftp-text.c:38
-msgid "Changes the remote working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:37
-msgid "chdir"
-msgstr ""
-
-#: src/text/gftp-text.c:39
-msgid "chmod"
-msgstr ""
-
-#: src/text/gftp-text.c:40
-msgid "Changes the permissions of a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:41
-msgid "clear"
-msgstr ""
-
-#: src/text/gftp-text.c:42
-msgid "Available options: cache"
-msgstr ""
-
-#: src/text/gftp-text.c:43
-msgid "close"
-msgstr ""
-
-#: src/text/gftp-text.c:44
-msgid "Disconnects from the remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:45
-msgid "delete"
-msgstr ""
-
-#: src/text/gftp-text.c:46
-msgid "Removes a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:47
-msgid "get"
-msgstr ""
-
-#: src/text/gftp-text.c:48 src/text/gftp-text.c:72
-msgid "Downloads remote file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:49
-msgid "help"
-msgstr ""
-
-#: src/text/gftp-text.c:50
-msgid "Shows this help screen"
-msgstr ""
-
-#: src/text/gftp-text.c:51
-msgid "lcd"
-msgstr ""
-
-#: src/text/gftp-text.c:52 src/text/gftp-text.c:54
-msgid "Changes the local working directory"
-msgstr ""
-
-#: src/text/gftp-text.c:53
-msgid "lchdir"
-msgstr ""
-
-#: src/text/gftp-text.c:55
-msgid "lchmod"
-msgstr ""
-
-#: src/text/gftp-text.c:56
-msgid "Changes the permissions of a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:57
-msgid "ldelete"
-msgstr ""
-
-#: src/text/gftp-text.c:58
-msgid "Removes a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:59
-msgid "lls"
-msgstr ""
-
-#: src/text/gftp-text.c:60
-msgid "Shows the directory listing for the current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:61
-msgid "lmkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:62
-msgid "Creates a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:63
-msgid "lpwd"
-msgstr ""
-
-#: src/text/gftp-text.c:64
-msgid "Show current local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:65
-msgid "lrename"
-msgstr ""
-
-#: src/text/gftp-text.c:66
-msgid "Rename a local file"
-msgstr ""
-
-#: src/text/gftp-text.c:67
-msgid "lrmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:68
-msgid "Remove a local directory"
-msgstr ""
-
-#: src/text/gftp-text.c:69
-msgid "ls"
-msgstr ""
-
-#: src/text/gftp-text.c:70
-msgid "Shows the directory listing for the current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:71
-msgid "mget"
-msgstr ""
-
-#: src/text/gftp-text.c:73
-msgid "mkdir"
-msgstr ""
-
-#: src/text/gftp-text.c:74
-msgid "Creates a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:75
-msgid "mput"
-msgstr ""
-
-#: src/text/gftp-text.c:76 src/text/gftp-text.c:80
-msgid "Uploads local file(s)"
-msgstr ""
-
-#: src/text/gftp-text.c:77
-msgid "open"
-msgstr ""
-
-#: src/text/gftp-text.c:78
-msgid "Opens a connection to a remote site"
-msgstr ""
-
-#: src/text/gftp-text.c:79
-msgid "put"
-msgstr ""
-
-#: src/text/gftp-text.c:81
-msgid "pwd"
-msgstr ""
-
-#: src/text/gftp-text.c:82
-msgid "Show current remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:83
-msgid "quit"
-msgstr ""
-
-#: src/text/gftp-text.c:84
-msgid "Exit from gFTP"
-msgstr ""
-
-#: src/text/gftp-text.c:85
-msgid "rename"
-msgstr ""
-
-#: src/text/gftp-text.c:86
-msgid "Rename a remote file"
-msgstr ""
-
-#: src/text/gftp-text.c:87
-msgid "rmdir"
-msgstr ""
-
-#: src/text/gftp-text.c:88
-msgid "Remove a remote directory"
-msgstr ""
-
-#: src/text/gftp-text.c:89
-msgid "set"
+#: src/text/gftp-text.c:166
+#, c-format
+msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/gftp-text.c:90
-msgid ""
-"Show configuration file variables. You can also set variables by set var=val"
-msgstr ""
+#: src/text/textui.c:80
+#, fuzzy
+msgid "Username [anonymous]:"
+msgstr "Používateľ:"
 
-#: src/text/gftp-text.c:148
+#: src/text/textui.c:158
+#, c-format
 msgid ""
-">.\n"
-"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";
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
-#: src/text/gftp-text.c:231
-msgid "Error: Command not recognized\n"
-msgstr ""
+#~ msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
+#~ msgstr ""
+#~ "použitie: gftp [[protokol://][používateľ[:heslo] ]server[:port][/"
+#~ "adresár]]\n"
 
-#: src/text/gftp-text.c:338
-msgid "usage: open [[ftp://][user:pass ]ftp-site[:port][/directory]]\n"
-msgstr ""
-
-#: src/text/gftp-text.c:414 src/text/gftp-text.c:430 src/text/gftp-text.c:473
-#: src/text/gftp-text.c:496 src/text/gftp-text.c:519 src/text/gftp-text.c:545
-#: src/text/gftp-text.c:573 src/text/gftp-text.c:606 src/text/gftp-text.c:699
-#: src/text/gftp-text.c:717 src/text/gftp-text.c:738 src/text/gftp-text.c:812
-msgid "Error: Not connected to a remote site\n"
-msgstr ""
-
-#: src/text/gftp-text.c:436 src/text/gftp-text.c:453
-msgid "usage: chdir <directory>\n"
-msgstr ""
-
-#: src/text/gftp-text.c:480
-msgid "usage: mkdir <new directory>\n"
-msgstr ""
+#~ msgid "Startup Directory:"
+#~ msgstr "Štartovací Adresár:"
 
-#: src/text/gftp-text.c:503
-msgid "usage: rmdir <directory>\n"
-msgstr ""
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Štandardný adresár v ktorom gFTP začne pracovať po štarte"
 
-#: src/text/gftp-text.c:526
-msgid "usage: delete <file>\n"
-msgstr ""
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Spúšťam prenos súboru na pozícii %lld\n"
 
-#: src/text/gftp-text.c:555
-msgid "usage: rename <old name> <new name>\n"
-msgstr ""
+#~ msgid "WARNING"
+#~ msgstr "UPOZORNENIE"
 
-#: src/text/gftp-text.c:583
-msgid "usage: chmod <mode> <file>\n"
-msgstr ""
+#~ msgid "  Cancel  "
+#~ msgstr "  Zrušiť  "
 
-#: src/text/gftp-text.c:745
-msgid "usage: mget <filespec>\n"
-msgstr ""
+#~ msgid "Apply"
+#~ msgstr "Aplikovať"
 
-#: src/text/gftp-text.c:819
-msgid "usage: mput <filespec>\n"
-msgstr ""
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Možnosti..."
 
-#: src/text/gftp-text.c:957
-#, c-format
-msgid "Could not download %s\n"
-msgstr ""
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Lokálne/Vytvoriť adresár..."
 
-#: src/text/gftp-text.c:964
-#, c-format
-msgid "Successfully transferred %s\n"
-msgstr ""
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/_Vzdialene/Vytvoriť adresár..."
 
-#: src/text/gftp-text.c:1031
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/_Prenosy/Spustiť prenos"
 
-#: src/text/gftp-text.c:1087
-msgid "usage: set [variable = value]\n"
-msgstr ""
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/_Prenosy/Zastaviť prenos"
 
-#: src/text/gftp-text.c:1101
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr ""
+#~ msgid "  Close  "
+#~ msgstr "  Zavrieť  "
 
-#: src/text/gftp-text.c:1108
-#, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr ""
+#~ msgid "Add"
+#~ msgstr "Pridať"
 
-#: src/text/gftp-text.c:1136
-msgid "Invalid argument\n"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Zrušiť"
 
-#: src/text/gftp-text.c:1161
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr ""
+#~ msgid "  Yes  "
+#~ msgstr "  Áno  "
 
-#: src/text/gftp-text.c:1239
-msgid "Clear the directory cache\n"
-msgstr ""
+#~ msgid "  No  "
+#~ msgstr "  Nie  "
diff --git a/po/sl.po b/po/sl.po
index 52db48e..1ff217c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,3000 +2,2997 @@
 # Copyright (C) 2009 gftp's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gftp package.
 # Andrej Žnidaršič <andrej znidarsic gmail com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gftp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-07-16 09:59+0000\n"
-"PO-Revision-Date: 2010-08-04 14:57+0100\n"
-"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../lib/bookmark.c:38
-#, c-format
-msgid "Invalid URL %s\n"
-msgstr "Neveljaven naslov URL %s\n"
-
-#: ../lib/cache.c:50
-#: ../lib/cache.c:64
-#: ../lib/cache.c:77
-#, c-format
-msgid "Error: Invalid line %s in cache index file\n"
-msgstr "Napaka: neveljavna vrstica %s v kazalu pomnilnika\n"
-
-#: ../lib/cache.c:138
-#: ../lib/fsp.c:535
-#: ../lib/local.c:561
-#, c-format
-msgid "Error: Could not make directory %s: %s\n"
-msgstr "Napaka: ni mogoče ustvariti mape %s: %s\n"
-
-#: ../lib/cache.c:164
-#, c-format
-msgid "Error: Cannot create temporary file: %s\n"
-msgstr "Napaka: ni mogoče ustvariti začasne datoteke: %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:272
-#: ../lib/rfc2068.c:260
-#: ../lib/sshv2.c:1250
-#, c-format
-msgid "Error closing file descriptor: %s\n"
-msgstr "Napaka med zapiranjem opisnika datoteke: %s\n"
-
-#: ../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 "Napaka: ni mogoče iskati po datoteki %s: %s\n"
-
-#: ../lib/charset-conv.c:73
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr "Napaka med pretvarjanjem niza '%s' iz znakovnega niza %s v znakovni niz %s: %s\n"
-
-#: ../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 "Napaka: ni mogoče odpreti krajevne datoteke %s: %s\n"
-
-#: ../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 "Napaka: ni mogoče pisati v vtič: %s\n"
-
-#: ../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 "Napaka: ni mogoče brati z vtiča: %s\n"
-
-#: ../lib/config_file.c:183
-#: ../lib/config_file.c:737
-#, c-format
-msgid "gFTP Error: Bad bookmarks file name %s\n"
-msgstr "Napaka gFTP: slabo ime datoteke zaznamkov %s\n"
-
-#: ../lib/config_file.c:192
-#, c-format
-msgid "Warning: Cannot find master bookmark file %s\n"
-msgstr "Opozorilo: ni mogoče najti glavne datoteke zaznamkov %s\n"
-
-#: ../lib/config_file.c:203
-#: ../lib/config_file.c:743
-#, c-format
-msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
-msgstr "Napaka gFTP: ni mogoče odpreti datoteke zaznamkov %s: %s\n"
-
-#: ../lib/config_file.c:295
-#: ../lib/config_file.c:317
-#, c-format
-msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
-msgstr "Opozorilo gFTP: preskočena je vrstica %d v datoteki zaznamkov: %s\n"
-
-#: ../lib/config_file.c:347
-#, c-format
-msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
-msgstr "Opozorilo gFTP: vrstica %d nima dovolj argumentov\n"
-
-#: ../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 "Ta odsek določa kateri gostitelji so na krajevni pod mreži in jim ni treba iti skozi posredniški 
strežnik (če je na voljo). Skladnja: dont_use_proxy=-domdna ali dont_use_proxy=številka mreže/omežna maska "
-
-#: ../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 "ext=pripona datoteke:XPM datoteka:Ascii ali Binarna (A ali B): program za ogled. Opomba: Vsi 
argumenti razen pripone datoteke so izbirni"
-
-#: ../lib/config_file.c:587
-#: ../lib/config_file.c:832
-#, c-format
-msgid "gFTP Error: Bad config file name %s\n"
-msgstr "Napaka gFTP: slabo ime nastavitvene datoteke %s\n"
-
-#: ../lib/config_file.c:598
-#, c-format
-msgid "gFTP Error: Could not make directory %s: %s\n"
-msgstr "Napaka gFTP: ni mogoče ustvariti mape %s: %s\n"
-
-#: ../lib/config_file.c:608
-#, c-format
-msgid "gFTP Error: Cannot find master config file %s\n"
-msgstr "Napaka gFTP: ni mogoče najti glavne nastavitvene datoteke %s\n"
-
-#: ../lib/config_file.c:610
-#, c-format
-msgid "Did you do a make install?\n"
-msgstr "Ali ste opravili namestitev?\n"
-
-#: ../lib/config_file.c:619
-#: ../lib/config_file.c:838
-#, c-format
-msgid "gFTP Error: Cannot open config file %s: %s\n"
-msgstr "Napaka gFTP: ni mogoče odpreti nastavitvene datoteke %s: %s\n"
-
-#: ../lib/config_file.c:658
-#, c-format
-msgid "Terminating due to parse errors at line %d in the config file\n"
-msgstr "Končanje zaradi napak razčlenjevanja v vrstici %d v nastavitveni datoteki\n"
-
-#: ../lib/config_file.c:664
-#, c-format
-msgid "gFTP Warning: Skipping line %d in config file: %s\n"
-msgstr "Opozorilo gFTP: preskočena je vrsticea %d v nastavitveni datoteki: %s\n"
-
-#: ../lib/config_file.c:671
-#, c-format
-msgid "gFTP Error: Bad log file name %s\n"
-msgstr "Napaka gFTP: slabo ime dnevniške datoteke %s\n"
-
-#: ../lib/config_file.c:677
-#, c-format
-msgid "gFTP Warning: Cannot open %s for writing: %s\n"
-msgstr "Opozorilo gFTP: %s ni mogoče odpreti za pisanje: %s\n"
-
-#: ../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 "Datoteka zaznamkov za gFTP. Avtorske pravice (C) 1998-2007 Brian Masney <masneyb gftp org>. 
Opozorilo: Vse opombe, ki jih boste dodali v to datoteko, bodo prepisane"
-
-#: ../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 someone standing over your shoulder while you're editing 
this file. Prior to this, all passwords were stored in plaintext."
-msgstr "Opomba: gesla v tej datoteki so premešana. Ta algoritem ni varen. To naj bi preprečilo, da bi si 
vaša gesla lahko zapomnil nekdo, ki bi vam stal za rameni med urejanjem te datoteke. Pred tem so bila vsa 
gesla shranjena v običajnemu besedilu."
-
-#: ../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 "Nastavitvena datoteka za gFTP. Avtorske pravice (C) 1998-2007 Brian Masney <masneyb gftp org>. 
Opozorilo: Vse opombe, ki jih dodate v to datoteko bodo bile prepisane. Če ima vnos v svoji opombi (*), ga 
znotraj gFTP ni mogoče spremeniti."
-
-#: ../lib/config_file.c:1209
-#: ../lib/protocols.c:385
-#: ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
-msgid "<unknown>"
-msgstr "<neznano>"
-
-#: ../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 "USODNA napaka gFTP: nastavitvene možnosti '%s' ni mogoče najti v preglednici splošnega razpršila\n"
-
-#: ../lib/fsp.c:189
-#, c-format
-msgid "Error: Cannot upload file %s\n"
-msgstr "Napaka: ni mogoče naložiti datoteke %s\n"
-
-#: ../lib/fsp.c:199
-#, c-format
-msgid "Error: Cannot write to file %s: %s\n"
-msgstr "Napaka: ni mogoče pisati v datoteko %s: %s\n"
-
-#: ../lib/fsp.c:237
-#, c-format
-msgid "Error: Error closing file: %s\n"
-msgstr "Napaka: napaka med zapiranjem datoteke: %s\n"
-
-#: ../lib/fsp.c:327
-#, c-format
-msgid "Corrupted file listing from FSP server %s\n"
-msgstr "Poškodovan seznam datotek s strežnika FSP %s\n"
-
-#: ../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 "neznano"
-
-#: ../lib/fsp.c:377
-#, c-format
-msgid "Could not get FSP directory listing %s: %s\n"
-msgstr "Ni mogoče dobiti FSP seznama map %s: %s\n"
-
-#: ../lib/fsp.c:436
-#, c-format
-msgid "Successfully changed directory to %s\n"
-msgstr "Mapa je bila uspešno spremenjena v %s\n"
-
-#: ../lib/fsp.c:446
-#, c-format
-msgid "Could not change directory to %s\n"
-msgstr "Ni mogoče spremeniti mape v %s\n"
-
-#: ../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 je bil uspešno odstranjen\n"
-
-#: ../lib/fsp.c:477
-#: ../lib/local.c:486
-#, c-format
-msgid "Error: Could not remove directory %s: %s\n"
-msgstr "Napaka: ni mogoče odstraniti mape %s: %s\n"
-
-#: ../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 "Napaka: ni mogoče odstraniti datoteke %s: %s\n"
-
-#: ../lib/fsp.c:528
-#: ../lib/local.c:554
-#, c-format
-msgid "Successfully made directory %s\n"
-msgstr "Mapa %s je bila uspešno ustvarjena\n"
-
-#: ../lib/fsp.c:563
-#: ../lib/local.c:590
-#, c-format
-msgid "Successfully renamed %s to %s\n"
-msgstr "%s je bil uspešno preimenovan v %s\n"
-
-#: ../lib/fsp.c:575
-#: ../lib/local.c:597
-#, c-format
-msgid "Error: Could not rename %s to %s: %s\n"
-msgstr "Napaka: ni mogoče preimenovati %s v %s: %s\n"
-
-#: ../lib/ftps.c:156
-msgid "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "Podpora FTPS ni na voljo ker podpora SSL ni bila prevedena. Prekinjanje povezave.\n"
-
-#: ../lib/https.c:91
-msgid "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
-msgstr "Podpora HTTPS ni na voljo ker podpora SSL ni bila prevedena. Prekinjanje povezave.\n"
-
-#: ../lib/local.c:66
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Ni mogoče dobiti trenutne delovne mape: %s\n"
-
-#: ../lib/local.c:105
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Krajevna mapa je bila uspešno spremenjena v %s\n"
-
-#: ../lib/local.c:112
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Ni mogoče spremeniti krajevne mape v %s: %s\n"
-
-#: ../lib/local.c:238
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Napaka: ni mogoče obrezati krajevne datoteke %s: %s\n"
-
-#: ../lib/local.c:424
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
-msgstr "Ni mogoče dobiti seznama krajevnih map %s: %s\n"
-
-#: ../lib/local.c:634
-#, c-format
-msgid "Successfully changed mode of %s to %o\n"
-msgstr "Način %s je bil uspešno spremenjen v %o\n"
-
-#: ../lib/local.c:641
-#, c-format
-msgid "Error: Could not change mode of %s to %o: %s\n"
-msgstr "Napaka: ni mogoče spremeniti načina %s v %o: %s\n"
-
-#: ../lib/local.c:676
-#, c-format
-msgid "Successfully changed the time stamp of %s\n"
-msgstr "Časovni žig %s je bil uspešno spremenjen\n"
-
-#: ../lib/local.c:683
-#, c-format
-msgid "Error: Could not change the time stamp of %s: %s\n"
-msgstr "Napaka: ni mogoče spremeniti časovnega žiga %s: %s\n"
-
-#: ../lib/local.c:750
-msgid "local filesystem"
-msgstr "krajevni datotečni sistem"
-
-#: ../lib/misc.c:414
-#, c-format
-msgid "usage: gftp "
-msgstr "uporaba: gftp"
-
-#. @null@
-#: ../lib/options.h:25
-#: ../lib/rfc959.c:26
-msgid "none"
-msgstr "brez"
-
-#: ../lib/options.h:25
-msgid "file"
-msgstr "datoteka"
-
-#: ../lib/options.h:26
-msgid "size"
-msgstr "velikost"
-
-#: ../lib/options.h:26
-msgid "user"
-msgstr "uporabnik"
-
-#: ../lib/options.h:27
-msgid "group"
-msgstr "skupina"
-
-#: ../lib/options.h:28
-msgid "datetime"
-msgstr "datumčas"
-
-#: ../lib/options.h:29
-msgid "attribs"
-msgstr "atributi"
-
-#. @null@
-#: ../lib/options.h:32
-msgid "descending"
-msgstr "padajoče"
-
-#: ../lib/options.h:33
-msgid "ascending"
-msgstr "naraščajoče"
-
-#: ../lib/options.h:40
-msgid "General"
-msgstr "Splošno"
-
-#: ../lib/options.h:43
-msgid "View program:"
-msgstr "Program za ogled:"
-
-#: ../lib/options.h:44
-msgid "The default program used to view files. If this is blank, the internal file viewer will be used"
-msgstr "Privzet program za ogled datotek.  V primeru da je to prazno, bo uporabljen notranji pregledovalnik 
datotek"
-
-#: ../lib/options.h:46
-msgid "Edit program:"
-msgstr "Program za urejanje:"
-
-#: ../lib/options.h:47
-msgid "The default program used to edit files."
-msgstr "Privzet program za urejanje datotek."
-
-#: ../lib/options.h:48
-msgid "Max Log Window Size:"
-msgstr "Največja velikost dnevniškega okna:"
-
-#: ../lib/options.h:50
-msgid "The maximum size of the log window in bytes for the GTK+ port"
-msgstr "To je največja velikost dnevniškega okna v bajtih za različico GTK+"
-
-#: ../lib/options.h:52
-msgid "Remote Character Sets:"
-msgstr "Oddaljen znakovni nizi:"
-
-#: ../lib/options.h:54
-msgid "This is a comma separated list of charsets to try to convert the remote messages to the current 
locale"
-msgstr "To je z vejico ločen seznam znakovnih nizov za poskus pretvorbe oddaljenih sporočil v trenutno 
jezikovno določilo"
-
-#: ../lib/options.h:56
-msgid "Remote LC_TIME:"
-msgstr "Oddaljeni LC_TIME"
-
-#: ../lib/options.h:58
-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 "To je vrednost LC_TIME za oddaljeno stran. To omogoča da so datumi v seznamu map pravilno 
razčlenjeni."
-
-#: ../lib/options.h:60
-msgid "Cache TTL:"
-msgstr "Predpomnilnik TTL:"
-
-#: ../lib/options.h:63
-msgid "The number of seconds to keep cache entries before they expire."
-msgstr "Število sekund preden se vnosi predpomnilnika iztečejo."
-
-#: ../lib/options.h:66
-msgid "Append file transfers"
-msgstr "Pripni prenose datotek"
-
-#: ../lib/options.h:68
-msgid "Append new file transfers onto existing ones"
-msgstr "Pripne nove prenose datotek na obstoječe"
-
-#: ../lib/options.h:69
-msgid "Do one transfer at a time"
-msgstr "Le en prenos hkrati"
-
-#: ../lib/options.h:71
-msgid "Do only one transfer at a time?"
-msgstr "Ali naj se izvede le en prenos hkrati?"
-
-#: ../lib/options.h:72
-msgid "Overwrite by Default"
-msgstr "Privzeto prepiši"
-
-#: ../lib/options.h:75
-msgid "Overwrite files by default or set to resume file transfers"
-msgstr "Privzeto prepiši datoteke ali nastavi za nadaljevanje prenosa datotek"
-
-#: ../lib/options.h:77
-msgid "Preserve file permissions"
-msgstr "Ohrani dovoljenja datotek"
-
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
-msgstr "Ohrani dovoljenja prenesenih datotek"
-
-#: ../lib/options.h:82
-msgid "Preserve file time"
-msgstr "Ohranit čas datoteke"
-
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
-msgstr "Ohrani čase prenesenih datotek"
-
-#: ../lib/options.h:87
-msgid "Refresh after each file transfer"
-msgstr "Osveži po vsakem prenosu datoteke"
-
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
-msgstr "Osveži polje s seznamom datotek po vsakem prenosu datoteke"
-
-#: ../lib/options.h:92
-msgid "Sort directories first"
-msgstr "Razvrsti mape najprej"
-
-#: ../lib/options.h:95
-msgid "Put the directories first then the files"
-msgstr "Postavi mape pred datoteke"
-
-#: ../lib/options.h:96
-msgid "Show hidden files"
-msgstr "Pokaži skrite datoteke"
-
-#: ../lib/options.h:99
-msgid "Show hidden files in the listboxes"
-msgstr "Pokaže skrite datoteke v polju seznama datotek"
-
-#: ../lib/options.h:100
-msgid "Show transfer status in title"
-msgstr "Pokaži stanje prenose v naslovu"
-
-#: ../lib/options.h:102
-msgid "Show the file transfer status in the titlebar"
-msgstr "Pokaže stanje prenosov datotek v nazivni vrstici"
-
-#: ../lib/options.h:103
-msgid "Start file transfers"
-msgstr "Začni prenos datotek"
-
-#: ../lib/options.h:105
-msgid "Automatically start the file transfers when they get queued"
-msgstr "Samodejen zagon prenosov datotek, ko so dodane v čakalno vrsto"
-
-#: ../lib/options.h:107
-msgid "Allow manual commands in GUI"
-msgstr "Dovoli ročne ukaze v uporabniškem vmesniku"
-
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr "Dovoli vnos ročnih ukazov v uporabniški vmesnik (funkcije kot besedna vrata)"
-
-#: ../lib/options.h:111
-msgid "Remember last directory"
-msgstr "Zapomni si zadnjo mapo"
-
-#: ../lib/options.h:113
-msgid "Save the last local and remote directory when the application is closed"
-msgstr "Shrani zadnjo krajevno in oddaljeno mapo ob zaprtju programa"
-
-#: ../lib/options.h:115
-msgid "Connect to remote server on startup"
-msgstr "Povezava z oddaljenim strežnikom ob zagonu"
-
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
-msgstr "Samodejna povezava z oddaljenim strežnikom ob zagonu programa."
-
-#: ../lib/options.h:120
-#: ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
-msgid "Network"
-msgstr "Omrežje"
-
-#: ../lib/options.h:122
-msgid "Network timeout:"
-msgstr "Zakasnitev omrežja:"
-
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "Zakasnitev za čakanje vhoda/izhoda omrežja. To NI zakasnitev nedejavnosti."
-
-#: ../lib/options.h:127
-msgid "Connect retries:"
-msgstr "Število ponovnih poskusov povezave:"
-
-#: ../lib/options.h:130
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "Število samodejnih poskusov. Številka 0 pomeni neskončno število poskusov"
-
-#: ../lib/options.h:132
-msgid "Retry sleep time:"
-msgstr "Čas med ponovnimi poskusi:"
-
-#: ../lib/options.h:135
-msgid "The number of seconds to wait between retries"
-msgstr "Čakanje med ponovnimi poskusi v sekundah"
-
-#: ../lib/options.h:136
-msgid "Max KB/S:"
-msgstr "Največ kB/s:"
-
-#: ../lib/options.h:139
-msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
-msgstr "Največja hitrost v kB/s, ki jo lahko doseže prenos datoteke. (0 za neomejno)"
-
-#: ../lib/options.h:141
-msgid "Transfer Block Size:"
-msgstr "Velikost bloka prenosa:"
-
-#: ../lib/options.h:144
-msgid "The block size that is used when transfering files. This should be a multiple of 1024."
-msgstr "Velikost bloka pri prenosu datotek. To naj bi bil mnogokratnik 1024."
-
-#: ../lib/options.h:147
-msgid "Default Protocol:"
-msgstr "Privzeti protokol:"
-
-#: ../lib/options.h:149
-msgid "This specifies the default protocol to use"
-msgstr "To določa uporabo privzetega protokola"
-
-#: ../lib/options.h:151
-#: ../lib/options.h:154
-msgid "Enable IPv6 support"
-msgstr "Omogoči podporo IPv6"
-
-#: ../lib/options.h:159
-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 "To določa kaj se bo zgodilo ob dvakratnem kliku datoteke v polju seznama datotek. 0=Ogled datoteke 
1=Urejanje datoteke 2=Prenos datoteke"
-
-#: ../lib/options.h:162
-msgid "The default width of the local files listbox"
-msgstr "Privzeta širina polja s seznamom krajevnih datotek"
-
-#: ../lib/options.h:165
-msgid "The default width of the remote files listbox"
-msgstr "Privzeta širina polja s seznamom oddaljenih datotek"
-
-#: ../lib/options.h:168
-msgid "The default height of the local/remote files listboxes"
-msgstr "Privzeta višina polj s seznami krajevnih/oddaljenih datotek"
-
-#: ../lib/options.h:171
-msgid "The default height of the transfer listbox"
-msgstr "Privzeta višina polja seznama prenosov"
-
-#: ../lib/options.h:174
-msgid "The default height of the logging window"
-msgstr "Privzeta višina dnevniškega okna"
-
-#: ../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 "Širina stolpca imena datotek v oknu prenosov. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost."
-
-#: ../lib/options.h:190
-#: ../lib/options.h:196
-msgid "The default column to sort by"
-msgstr "Privzeta razvrstitev stolpcev"
-
-#: ../lib/options.h:193
-#: ../lib/options.h:199
-msgid "Sort ascending or descending"
-msgstr "Razvrstitev naraščajoče ali padajoče"
-
-#: ../lib/options.h:203
-#: ../lib/options.h:221
-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 "Širina stolpca ime datoteke v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno 
spreminja velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:206
-#: ../lib/options.h:224
-msgid "The width of the size column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Širina stolpca velikost v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:209
-#: ../lib/options.h:227
-msgid "The width of the user column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Širina stolpca uporabnik v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:212
-#: ../lib/options.h:230
-msgid "The width of the group column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Širina stolpca skupina v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:215
-#: ../lib/options.h:233
-msgid "The width of the date column in the file listboxes. Set this to 0 to have this column automagically 
resize. Set this to -1 to disable this column"
-msgstr "Širina stolpca datum v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:218
-#: ../lib/options.h:236
-msgid "The width of the attribs column in the file listboxes. Set this to 0 to have this column 
automagically resize. Set this to -1 to disable this column"
-msgstr "Širina stolpca atributi v polju seznama datotek. Vrednost 0 določi, da stolpec samodejno spreminja 
velikost. Vrednost -1 onemogoči ta stolpec"
-
-#: ../lib/options.h:239
-msgid "The color of the commands that are sent to the server"
-msgstr "Barva ukazov poslanih strežniku"
-
-#: ../lib/options.h:242
-msgid "The color of the commands that are received from the server"
-msgstr "Barva ukazov prejetih s strežnika"
-
-#: ../lib/options.h:245
-msgid "The color of the error messages"
-msgstr "Barva sporočil o napakah"
-
-#: ../lib/options.h:248
-msgid "The color of the rest of the log messages"
-msgstr "Barva preostanka dnevniških sporočil"
-
-#: ../lib/options.h:254
-#: ../lib/rfc959.c:40
-msgid "FTP"
-msgstr "FTP"
-
-#: ../lib/options.h:257
-#: ../lib/options.h:259
-msgid "FTPS"
-msgstr "FTPS"
-
-#: ../lib/options.h:262
-#: ../lib/rfc2068.c:27
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../lib/options.h:265
-#: ../lib/options.h:267
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: ../lib/options.h:270
-msgid "Local"
-msgstr "Krajevno"
-
-#: ../lib/options.h:272
-msgid "SSH2"
-msgstr "SSH2"
-
-#: ../lib/options.h:274
-#: ../src/gtk/bookmarks.c:883
-msgid "Bookmark"
-msgstr "Zaznamek"
-
-#: ../lib/options.h:275
-msgid "FSP"
-msgstr "FSP"
-
-#: ../lib/protocols.c:228
-#, c-format
-msgid "File transfer will be throttled to %.2f KB/s\n"
-msgstr "Hitrost prenosa datoteke bo omejena na %.2f kB/s\n"
-
-#: ../lib/protocols.c:381
-#, c-format
-msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
-msgstr "Napaka med nastavljanjem LC_TIME na '%s'. Povrnjeno nazaj na '%s'\n"
-
-#: ../lib/protocols.c:392
-#, c-format
-msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
-msgstr "Nalaganje seznama map %s iz predpomnilnika (LC_TIME=%s)\n"
-
-#: ../lib/protocols.c:402
-#, c-format
-msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
-msgstr "Nalaganje seznama map %s s strežnika (LC_TIME=%s)\n"
-
-#: ../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 "Opozorilo: Skrajševanje poti datoteke '%s'. Skrajšana pot (%s) se ne sklada s trenutno mapo (%s)\n"
-
-#: ../lib/protocols.c:483
-#, c-format
-msgid "Error: Cannot write to cache: %s\n"
-msgstr "Napaka: Ni mogoče pisati v predpomnilnik: %s\n"
-
-#: ../lib/protocols.c:516
-#, c-format
-msgid "Error: Could not find bookmark %s\n"
-msgstr "Napaka: Ni mogoče najti zaznamka %s\n"
-
-#: ../lib/protocols.c:523
-#, c-format
-msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
-msgstr "Napaka zaznamkov: Vnos zaznamka %s nima imena gostitelja\n"
-
-#: ../lib/protocols.c:645
-#: ../lib/protocols.c:672
-#, c-format
-msgid "The protocol '%s' is currently not supported.\n"
-msgstr "Protokol '%s' trenutno ni podprt.\n"
-
-#: ../lib/protocols.c:1155
-#, c-format
-msgid "Found recursive symbolic link %s\n"
-msgstr "Najdena je bila rekurzivna simbolna povezava %s\n"
-
-#: ../lib/protocols.c:1533
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "Napaka: Oddaljena stran %s je prekinila povezavo. Največje število poskusov je doseženo ... konec 
povezovanja\n"
-
-#: ../lib/protocols.c:1541
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "Napaka: Oddaljena stran %s je prekinila povezavo. Ponovna povezava bo vzpostavljena v %d sekundah\n"
-
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: gftp master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
+"PO-Revision-Date: 2010-08-04 14:57+0100\n"
+"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: lib/bookmark.c:38
+#, c-format
+msgid "Invalid URL %s\n"
+msgstr "Neveljaven naslov URL %s\n"
+
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
+#, c-format
+msgid "Error: Invalid line %s in cache index file\n"
+msgstr "Napaka: neveljavna vrstica %s v kazalu pomnilnika\n"
+
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
+#, c-format
+msgid "Error: Could not make directory %s: %s\n"
+msgstr "Napaka: ni mogoče ustvariti mape %s: %s\n"
+
+#: lib/cache.c:164
+#, c-format
+msgid "Error: Cannot create temporary file: %s\n"
+msgstr "Napaka: ni mogoče ustvariti začasne datoteke: %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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
+#, c-format
+msgid "Error closing file descriptor: %s\n"
+msgstr "Napaka med zapiranjem opisnika datoteke: %s\n"
+
+#: 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 "Napaka: ni mogoče iskati po datoteki %s: %s\n"
+
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Napaka med pretvarjanjem niza '%s' iz znakovnega niza %s v znakovni niz %s: "
+"%s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
+#, c-format
+msgid "Error: Cannot open local file %s: %s\n"
+msgstr "Napaka: ni mogoče odpreti krajevne datoteke %s: %s\n"
+
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, c-format
+msgid "Error: Could not write to socket: %s\n"
+msgstr "Napaka: ni mogoče pisati v vtič: %s\n"
+
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, c-format
+msgid "Error: Could not read from socket: %s\n"
+msgstr "Napaka: ni mogoče brati z vtiča: %s\n"
+
+#: lib/config_file.c:183 lib/config_file.c:737
+#, c-format
+msgid "gFTP Error: Bad bookmarks file name %s\n"
+msgstr "Napaka gFTP: slabo ime datoteke zaznamkov %s\n"
+
+#: lib/config_file.c:192
+#, c-format
+msgid "Warning: Cannot find master bookmark file %s\n"
+msgstr "Opozorilo: ni mogoče najti glavne datoteke zaznamkov %s\n"
+
+#: lib/config_file.c:203 lib/config_file.c:743
+#, c-format
+msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
+msgstr "Napaka gFTP: ni mogoče odpreti datoteke zaznamkov %s: %s\n"
+
+#: lib/config_file.c:295 lib/config_file.c:317
+#, c-format
+msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
+msgstr "Opozorilo gFTP: preskočena je vrstica %d v datoteki zaznamkov: %s\n"
+
+#: lib/config_file.c:347
+#, c-format
+msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
+msgstr "Opozorilo gFTP: vrstica %d nima dovolj argumentov\n"
+
+#: 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 ""
+"Ta odsek določa kateri gostitelji so na krajevni pod mreži in jim ni treba "
+"iti skozi posredniški strežnik (če je na voljo). Skladnja: dont_use_proxy=-"
+"domdna ali dont_use_proxy=številka mreže/omežna maska "
+
+#: 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 ""
+"ext=pripona datoteke:XPM datoteka:Ascii ali Binarna (A ali B): program za "
+"ogled. Opomba: Vsi argumenti razen pripone datoteke so izbirni"
+
+#: lib/config_file.c:587 lib/config_file.c:832
+#, c-format
+msgid "gFTP Error: Bad config file name %s\n"
+msgstr "Napaka gFTP: slabo ime nastavitvene datoteke %s\n"
+
+#: lib/config_file.c:598
+#, c-format
+msgid "gFTP Error: Could not make directory %s: %s\n"
+msgstr "Napaka gFTP: ni mogoče ustvariti mape %s: %s\n"
+
+#: lib/config_file.c:608
+#, c-format
+msgid "gFTP Error: Cannot find master config file %s\n"
+msgstr "Napaka gFTP: ni mogoče najti glavne nastavitvene datoteke %s\n"
+
+#: lib/config_file.c:610
+#, c-format
+msgid "Did you do a make install?\n"
+msgstr "Ali ste opravili namestitev?\n"
+
+#: lib/config_file.c:619 lib/config_file.c:838
+#, c-format
+msgid "gFTP Error: Cannot open config file %s: %s\n"
+msgstr "Napaka gFTP: ni mogoče odpreti nastavitvene datoteke %s: %s\n"
+
+#: lib/config_file.c:658
+#, c-format
+msgid "Terminating due to parse errors at line %d in the config file\n"
+msgstr ""
+"Končanje zaradi napak razčlenjevanja v vrstici %d v nastavitveni datoteki\n"
+
+#: lib/config_file.c:664
+#, c-format
+msgid "gFTP Warning: Skipping line %d in config file: %s\n"
+msgstr ""
+"Opozorilo gFTP: preskočena je vrsticea %d v nastavitveni datoteki: %s\n"
+
+#: lib/config_file.c:671
+#, c-format
+msgid "gFTP Error: Bad log file name %s\n"
+msgstr "Napaka gFTP: slabo ime dnevniške datoteke %s\n"
+
+#: lib/config_file.c:677
+#, c-format
+msgid "gFTP Warning: Cannot open %s for writing: %s\n"
+msgstr "Opozorilo gFTP: %s ni mogoče odpreti za pisanje: %s\n"
+
+#: 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 ""
+"Datoteka zaznamkov za gFTP. Avtorske pravice (C) 1998-2007 Brian Masney "
+"<masneyb gftp org>. Opozorilo: Vse opombe, ki jih boste dodali v to "
+"datoteko, bodo prepisane"
+
+#: 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 "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+"Opomba: gesla v tej datoteki so premešana. Ta algoritem ni varen. To naj bi "
+"preprečilo, da bi si vaša gesla lahko zapomnil nekdo, ki bi vam stal za "
+"rameni med urejanjem te datoteke. Pred tem so bila vsa gesla shranjena v "
+"običajnemu besedilu."
+
+#: 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 ""
+"Nastavitvena datoteka za gFTP. Avtorske pravice (C) 1998-2007 Brian Masney "
+"<masneyb gftp org>. Opozorilo: Vse opombe, ki jih dodate v to datoteko bodo "
+"bile prepisane. Če ima vnos v svoji opombi (*), ga znotraj gFTP ni mogoče "
+"spremeniti."
+
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
+msgid "<unknown>"
+msgstr "<neznano>"
+
+#: 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 ""
+"USODNA napaka gFTP: nastavitvene možnosti '%s' ni mogoče najti v preglednici "
+"splošnega razpršila\n"
+
+#: lib/fsp.c:189
+#, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Napaka: ni mogoče naložiti datoteke %s\n"
+
+#: lib/fsp.c:199
+#, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Napaka: ni mogoče pisati v datoteko %s: %s\n"
+
+#: lib/fsp.c:237
+#, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Napaka: napaka med zapiranjem datoteke: %s\n"
+
+#: lib/fsp.c:327
+#, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "Poškodovan seznam datotek s strežnika FSP %s\n"
+
+#: 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 "neznano"
+
+#: lib/fsp.c:377
+#, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
+msgstr "Ni mogoče dobiti FSP seznama map %s: %s\n"
+
+#: lib/fsp.c:436
+#, c-format
+msgid "Successfully changed directory to %s\n"
+msgstr "Mapa je bila uspešno spremenjena v %s\n"
+
+#: lib/fsp.c:446
+#, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Ni mogoče spremeniti mape v %s\n"
+
+#: 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:304
+#, c-format
+msgid "Successfully removed %s\n"
+msgstr "%s je bil uspešno odstranjen\n"
+
+#: lib/fsp.c:477 lib/local.c:486
+#, c-format
+msgid "Error: Could not remove directory %s: %s\n"
+msgstr "Napaka: ni mogoče odstraniti mape %s: %s\n"
+
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
+#, c-format
+msgid "Error: Could not remove file %s: %s\n"
+msgstr "Napaka: ni mogoče odstraniti datoteke %s: %s\n"
+
+#: lib/fsp.c:528 lib/local.c:554
+#, c-format
+msgid "Successfully made directory %s\n"
+msgstr "Mapa %s je bila uspešno ustvarjena\n"
+
+#: lib/fsp.c:563 lib/local.c:590
+#, c-format
+msgid "Successfully renamed %s to %s\n"
+msgstr "%s je bil uspešno preimenovan v %s\n"
+
+#: lib/fsp.c:575 lib/local.c:597
+#, c-format
+msgid "Error: Could not rename %s to %s: %s\n"
+msgstr "Napaka: ni mogoče preimenovati %s v %s: %s\n"
+
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podpora FTPS ni na voljo ker podpora SSL ni bila prevedena. Prekinjanje "
+"povezave.\n"
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podpora HTTPS ni na voljo ker podpora SSL ni bila prevedena. Prekinjanje "
+"povezave.\n"
+
+#: lib/local.c:66
+#, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr "Ni mogoče dobiti trenutne delovne mape: %s\n"
+
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Krajevna mapa je bila uspešno spremenjena v %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Ni mogoče spremeniti krajevne mape v %s: %s\n"
+
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Napaka: ni mogoče obrezati krajevne datoteke %s: %s\n"
+
+#: lib/local.c:424
+#, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Ni mogoče dobiti seznama krajevnih map %s: %s\n"
+
+#: lib/local.c:634
+#, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Način %s je bil uspešno spremenjen v %o\n"
+
+#: lib/local.c:641
+#, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Napaka: ni mogoče spremeniti načina %s v %o: %s\n"
+
+#: lib/local.c:676
+#, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Časovni žig %s je bil uspešno spremenjen\n"
+
+#: lib/local.c:683
+#, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Napaka: ni mogoče spremeniti časovnega žiga %s: %s\n"
+
+#: lib/local.c:750
+msgid "local filesystem"
+msgstr "krajevni datotečni sistem"
+
+#: lib/misc.c:414
+#, c-format
+msgid "usage: gftp "
+msgstr "uporaba: gftp"
+
+#: lib/options.h:25 lib/rfc959.c:26
+msgid "none"
+msgstr "brez"
+
+#: lib/options.h:25
+msgid "file"
+msgstr "datoteka"
+
+#: lib/options.h:26
+msgid "size"
+msgstr "velikost"
+
+#: lib/options.h:26
+msgid "user"
+msgstr "uporabnik"
+
+#: lib/options.h:27
+msgid "group"
+msgstr "skupina"
+
+#: lib/options.h:28
+msgid "datetime"
+msgstr "datumčas"
+
+#: lib/options.h:29
+msgid "attribs"
+msgstr "atributi"
+
+#: lib/options.h:32
+msgid "descending"
+msgstr "padajoče"
+
+#: lib/options.h:33
+msgid "ascending"
+msgstr "naraščajoče"
+
+#: lib/options.h:40
+msgid "General"
+msgstr "Splošno"
+
+#: lib/options.h:43
+msgid "View program:"
+msgstr "Program za ogled:"
+
+#: lib/options.h:44
+msgid ""
+"The default program used to view files. If this is blank, the internal file "
+"viewer will be used"
+msgstr ""
+"Privzet program za ogled datotek.  V primeru da je to prazno, bo uporabljen "
+"notranji pregledovalnik datotek"
+
+#: lib/options.h:46
+msgid "Edit program:"
+msgstr "Program za urejanje:"
+
+#: lib/options.h:47
+msgid "The default program used to edit files."
+msgstr "Privzet program za urejanje datotek."
+
+#: lib/options.h:48
+msgid "Max Log Window Size:"
+msgstr "Največja velikost dnevniškega okna:"
+
+#: lib/options.h:50
+msgid "The maximum size of the log window in bytes for the GTK+ port"
+msgstr "To je največja velikost dnevniškega okna v bajtih za različico GTK+"
+
+#: lib/options.h:52
+msgid "Remote Character Sets:"
+msgstr "Oddaljen znakovni nizi:"
+
+#: lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
+msgstr ""
+"To je z vejico ločen seznam znakovnih nizov za poskus pretvorbe oddaljenih "
+"sporočil v trenutno jezikovno določilo"
+
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr "Oddaljeni LC_TIME"
+
+#: lib/options.h:58
+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 ""
+"To je vrednost LC_TIME za oddaljeno stran. To omogoča da so datumi v seznamu "
+"map pravilno razčlenjeni."
+
+#: lib/options.h:60
+msgid "Cache TTL:"
+msgstr "Predpomnilnik TTL:"
+
+#: lib/options.h:63
+msgid "The number of seconds to keep cache entries before they expire."
+msgstr "Število sekund preden se vnosi predpomnilnika iztečejo."
+
+#: lib/options.h:66
+msgid "Append file transfers"
+msgstr "Pripni prenose datotek"
+
+#: lib/options.h:68
+msgid "Append new file transfers onto existing ones"
+msgstr "Pripne nove prenose datotek na obstoječe"
+
+#: lib/options.h:69
+msgid "Do one transfer at a time"
+msgstr "Le en prenos hkrati"
+
+#: lib/options.h:71
+msgid "Do only one transfer at a time?"
+msgstr "Ali naj se izvede le en prenos hkrati?"
+
+#: lib/options.h:72
+msgid "Overwrite by Default"
+msgstr "Privzeto prepiši"
+
+#: lib/options.h:75
+msgid "Overwrite files by default or set to resume file transfers"
+msgstr "Privzeto prepiši datoteke ali nastavi za nadaljevanje prenosa datotek"
+
+#: lib/options.h:77
+msgid "Preserve file permissions"
+msgstr "Ohrani dovoljenja datotek"
+
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
+msgstr "Ohrani dovoljenja prenesenih datotek"
+
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr "Ohranit čas datoteke"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "Ohrani čase prenesenih datotek"
+
+#: lib/options.h:87
+msgid "Refresh after each file transfer"
+msgstr "Osveži po vsakem prenosu datoteke"
+
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
+msgstr "Osveži polje s seznamom datotek po vsakem prenosu datoteke"
+
+#: lib/options.h:92
+msgid "Sort directories first"
+msgstr "Razvrsti mape najprej"
+
+#: lib/options.h:95
+msgid "Put the directories first then the files"
+msgstr "Postavi mape pred datoteke"
+
+#: lib/options.h:96
+msgid "Show hidden files"
+msgstr "Pokaži skrite datoteke"
+
+#: lib/options.h:99
+msgid "Show hidden files in the listboxes"
+msgstr "Pokaže skrite datoteke v polju seznama datotek"
+
+#: lib/options.h:100
+msgid "Show transfer status in title"
+msgstr "Pokaži stanje prenose v naslovu"
+
+#: lib/options.h:102
+msgid "Show the file transfer status in the titlebar"
+msgstr "Pokaže stanje prenosov datotek v nazivni vrstici"
+
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr "Začni prenos datotek"
+
+#: lib/options.h:105
+msgid "Automatically start the file transfers when they get queued"
+msgstr "Samodejen zagon prenosov datotek, ko so dodane v čakalno vrsto"
+
+#: lib/options.h:107
+msgid "Allow manual commands in GUI"
+msgstr "Dovoli ročne ukaze v uporabniškem vmesniku"
+
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
+msgstr ""
+"Dovoli vnos ročnih ukazov v uporabniški vmesnik (funkcije kot besedna vrata)"
+
+#: lib/options.h:111
+msgid "Remember last directory"
+msgstr "Zapomni si zadnjo mapo"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr "Shrani zadnjo krajevno in oddaljeno mapo ob zaprtju programa"
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr "Povezava z oddaljenim strežnikom ob zagonu"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr "Samodejna povezava z oddaljenim strežnikom ob zagonu programa."
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
+msgid "Network"
+msgstr "Omrežje"
+
+#: lib/options.h:122
+msgid "Network timeout:"
+msgstr "Zakasnitev omrežja:"
+
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"Zakasnitev za čakanje vhoda/izhoda omrežja. To NI zakasnitev nedejavnosti."
+
+#: lib/options.h:127
+msgid "Connect retries:"
+msgstr "Število ponovnih poskusov povezave:"
+
+#: lib/options.h:130
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
+msgstr ""
+"Število samodejnih poskusov. Številka 0 pomeni neskončno število poskusov"
+
+#: lib/options.h:132
+msgid "Retry sleep time:"
+msgstr "Čas med ponovnimi poskusi:"
+
+#: lib/options.h:135
+msgid "The number of seconds to wait between retries"
+msgstr "Čakanje med ponovnimi poskusi v sekundah"
+
+#: lib/options.h:136
+msgid "Max KB/S:"
+msgstr "Največ kB/s:"
+
+#: lib/options.h:139
+msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
+msgstr ""
+"Največja hitrost v kB/s, ki jo lahko doseže prenos datoteke. (0 za neomejno)"
+
+#: lib/options.h:141
+msgid "Transfer Block Size:"
+msgstr "Velikost bloka prenosa:"
+
+#: lib/options.h:144
+#, fuzzy
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr "Velikost bloka pri prenosu datotek. To naj bi bil mnogokratnik 1024."
+
+#: lib/options.h:147
+msgid "Default Protocol:"
+msgstr "Privzeti protokol:"
+
+#: lib/options.h:149
+msgid "This specifies the default protocol to use"
+msgstr "To določa uporabo privzetega protokola"
+
+#: lib/options.h:151 lib/options.h:154
+msgid "Enable IPv6 support"
+msgstr "Omogoči podporo IPv6"
+
+#: lib/options.h:159
+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 ""
+"To določa kaj se bo zgodilo ob dvakratnem kliku datoteke v polju seznama "
+"datotek. 0=Ogled datoteke 1=Urejanje datoteke 2=Prenos datoteke"
+
+#: lib/options.h:162
+msgid "The default width of the local files listbox"
+msgstr "Privzeta širina polja s seznamom krajevnih datotek"
+
+#: lib/options.h:165
+msgid "The default width of the remote files listbox"
+msgstr "Privzeta širina polja s seznamom oddaljenih datotek"
+
+#: lib/options.h:168
+msgid "The default height of the local/remote files listboxes"
+msgstr "Privzeta višina polj s seznami krajevnih/oddaljenih datotek"
+
+#: lib/options.h:171
+msgid "The default height of the transfer listbox"
+msgstr "Privzeta višina polja seznama prenosov"
+
+#: lib/options.h:174
+msgid "The default height of the logging window"
+msgstr "Privzeta višina dnevniškega okna"
+
+#: 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 ""
+"Širina stolpca imena datotek v oknu prenosov. Vrednost 0 določi, da stolpec "
+"samodejno spreminja velikost."
+
+#: lib/options.h:190 lib/options.h:196
+msgid "The default column to sort by"
+msgstr "Privzeta razvrstitev stolpcev"
+
+#: lib/options.h:193 lib/options.h:199
+msgid "Sort ascending or descending"
+msgstr "Razvrstitev naraščajoče ali padajoče"
+
+#: lib/options.h:203 lib/options.h:221
+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 ""
+"Širina stolpca ime datoteke v polju seznama datotek. Vrednost 0 določi, da "
+"stolpec samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:206 lib/options.h:224
+msgid ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Širina stolpca velikost v polju seznama datotek. Vrednost 0 določi, da "
+"stolpec samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:209 lib/options.h:227
+msgid ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Širina stolpca uporabnik v polju seznama datotek. Vrednost 0 določi, da "
+"stolpec samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:212 lib/options.h:230
+msgid ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Širina stolpca skupina v polju seznama datotek. Vrednost 0 določi, da "
+"stolpec samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:215 lib/options.h:233
+msgid ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Širina stolpca datum v polju seznama datotek. Vrednost 0 določi, da stolpec "
+"samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:218 lib/options.h:236
+msgid ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Širina stolpca atributi v polju seznama datotek. Vrednost 0 določi, da "
+"stolpec samodejno spreminja velikost. Vrednost -1 onemogoči ta stolpec"
+
+#: lib/options.h:239
+msgid "The color of the commands that are sent to the server"
+msgstr "Barva ukazov poslanih strežniku"
+
+#: lib/options.h:242
+msgid "The color of the commands that are received from the server"
+msgstr "Barva ukazov prejetih s strežnika"
+
+#: lib/options.h:245
+msgid "The color of the error messages"
+msgstr "Barva sporočil o napakah"
+
+#: lib/options.h:248
+msgid "The color of the rest of the log messages"
+msgstr "Barva preostanka dnevniških sporočil"
+
+#: lib/options.h:254 lib/rfc959.c:40
+msgid "FTP"
+msgstr "FTP"
+
+#: lib/options.h:257 lib/options.h:259
+msgid "FTPS"
+msgstr "FTPS"
+
+#: lib/options.h:262 lib/rfc2068.c:27
+msgid "HTTP"
+msgstr "HTTP"
+
+#: lib/options.h:265 lib/options.h:267
+msgid "HTTPS"
+msgstr "HTTPS"
+
+#: lib/options.h:270
+msgid "Local"
+msgstr "Krajevno"
+
+#: lib/options.h:272
+msgid "SSH2"
+msgstr "SSH2"
+
+#: lib/options.h:274 src/gtk/bookmarks.c:855
+msgid "Bookmark"
+msgstr "Zaznamek"
+
+#: lib/options.h:275
+msgid "FSP"
+msgstr "FSP"
+
+#: lib/protocols.c:226
+#, c-format
+msgid "File transfer will be throttled to %.2f KB/s\n"
+msgstr "Hitrost prenosa datoteke bo omejena na %.2f kB/s\n"
+
+#: lib/protocols.c:379
+#, c-format
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr "Napaka med nastavljanjem LC_TIME na '%s'. Povrnjeno nazaj na '%s'\n"
+
+#: lib/protocols.c:390
+#, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
+msgstr "Nalaganje seznama map %s iz predpomnilnika (LC_TIME=%s)\n"
+
+#: lib/protocols.c:400
+#, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
+msgstr "Nalaganje seznama map %s s strežnika (LC_TIME=%s)\n"
+
+#: lib/protocols.c:450
+#, c-format
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
+msgstr ""
+"Opozorilo: Skrajševanje poti datoteke '%s'. Skrajšana pot (%s) se ne sklada "
+"s trenutno mapo (%s)\n"
+
+#: lib/protocols.c:481
+#, c-format
+msgid "Error: Cannot write to cache: %s\n"
+msgstr "Napaka: Ni mogoče pisati v predpomnilnik: %s\n"
+
+#: lib/protocols.c:514
+#, c-format
+msgid "Error: Could not find bookmark %s\n"
+msgstr "Napaka: Ni mogoče najti zaznamka %s\n"
+
+#: lib/protocols.c:521
+#, c-format
+msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
+msgstr "Napaka zaznamkov: Vnos zaznamka %s nima imena gostitelja\n"
+
+#: lib/protocols.c:643 lib/protocols.c:670
+#, c-format
+msgid "The protocol '%s' is currently not supported.\n"
+msgstr "Protokol '%s' trenutno ni podprt.\n"
+
+#: lib/protocols.c:1153
+#, c-format
+msgid "Found recursive symbolic link %s\n"
+msgstr "Najdena je bila rekurzivna simbolna povezava %s\n"
+
+#: lib/protocols.c:1531
+#, c-format
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgstr ""
+"Napaka: Oddaljena stran %s je prekinila povezavo. Največje število poskusov "
+"je doseženo ... konec povezovanja\n"
+
+#: lib/protocols.c:1539
+#, c-format
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgstr ""
+"Napaka: Oddaljena stran %s je prekinila povezavo. Ponovna povezava bo "
+"vzpostavljena v %d sekundah\n"
+
 # Je to pravilno ?
-#: ../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 "Napaka: Ni mogoče nastaviti zastavice za zapiranje ob izvajanju: %s\n"
-
-#: ../lib/pty.c:301
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr "Ni mogoče odpreti glavnega pty %s: %s\n"
-
-#: ../lib/pty.c:309
-#, c-format
-msgid "Cannot create a socket pair: %s\n"
-msgstr "Ni mogoče ustvariti para vtičev: %s\n"
-
-#: ../lib/pty.c:338
-#, c-format
-msgid "Error: Cannot execute ssh: %s\n"
-msgstr "Napaka: Ni mogoče izvesti ssh: %s\n"
-
-#: ../lib/pty.c:354
-#, c-format
-msgid "Cannot fork another process: %s\n"
-msgstr "Ni mogoče vejiti drugega opravila: %s\n"
-
-#: ../lib/rfc2068.c:30
-#: ../lib/rfc959.c:47
-msgid "Proxy hostname:"
-msgstr "Ime gostitelja posredniškega strežnika:"
-
-#: ../lib/rfc2068.c:32
-#: ../lib/rfc959.c:49
-msgid "Firewall hostname"
-msgstr "Ime gostitelja požarnega zidu"
-
-#: ../lib/rfc2068.c:33
-#: ../lib/rfc959.c:50
-msgid "Proxy port:"
-msgstr "Vrata posredniškega strežnika:"
-
-#: ../lib/rfc2068.c:35
-#: ../lib/rfc959.c:52
-msgid "Port to connect to on the firewall"
-msgstr "Vrata za povezavo na požarnem zidu"
-
-#: ../lib/rfc2068.c:36
-#: ../lib/rfc959.c:53
-msgid "Proxy username:"
-msgstr "Uporabniško ime posredniškega strežnika:"
-
-#: ../lib/rfc2068.c:38
-#: ../lib/rfc959.c:55
-msgid "Your firewall username"
-msgstr "Uporabniško ime požarnega zidu"
-
-#: ../lib/rfc2068.c:39
-#: ../lib/rfc959.c:56
-msgid "Proxy password:"
-msgstr "Geslo posredniškega strežnika:"
-
-#: ../lib/rfc2068.c:41
-#: ../lib/rfc959.c:58
-msgid "Your firewall password"
-msgstr "Vaše geslo požarnega zidu"
-
-#: ../lib/rfc2068.c:43
-msgid "Use HTTP/1.1"
-msgstr "Uporabi HTTP/1.1"
-
-#: ../lib/rfc2068.c:46
-msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
-msgstr "Želite uporabljati HTTP/1.1 ali HTTP/1.0"
-
-#: ../lib/rfc2068.c:151
-#: ../lib/rfc2068.c:840
-#, c-format
-msgid ""
-"Received wrong response from server, disconnecting\n"
-"Invalid chunk size '%s' returned by the remote server\n"
-msgstr ""
-"Prejet je bil napačen odziv s strežnika, prekinjanje povezave\n"
-"Oddaljeni strežnik je vrnil neveljavno velikost rezine '%s'\n"
-
-#: ../lib/rfc2068.c:255
-#: ../lib/rfc959.c:679
-#: ../lib/sshv2.c:1245
-#, c-format
-msgid "Disconnecting from site %s\n"
-msgstr "Prekinjanje povezave s stranjo %s\n"
-
-#: ../lib/rfc2068.c:301
-msgid "Starting the file transfer at offset "
-msgstr "Začenjanje prenosa datoteke z zamikom"
-
-#: ../lib/rfc2068.c:322
-#, c-format
-msgid "Cannot retrieve file %s\n"
-msgstr "Ni mogoče pridobiti datoteke %s\n"
-
-#: ../lib/rfc2068.c:421
-#: ../lib/sshv2.c:1327
-msgid "Retrieving directory listing...\n"
-msgstr "Pridobivanje seznama map ...\n"
-
-#: ../lib/rfc2068.c:816
-#: ../lib/sshv2.c:895
-msgid "Received wrong response from server, disconnecting\n"
-msgstr "Prejet je bil napačen odziv s strežnika, prekinjanje povezave\n"
-
-#: ../lib/rfc959.c:27
-msgid "SITE command"
-msgstr "Ukaz SITE"
-
-#: ../lib/rfc959.c:28
-msgid "user host"
-msgstr "uporabnik gostitelj"
-
-#: ../lib/rfc959.c:29
-msgid "user host:port"
-msgstr "uporabnik gostitelj:vrata"
-
-#: ../lib/rfc959.c:30
-msgid "AUTHENTICATE"
-msgstr "OVERI"
-
-#: ../lib/rfc959.c:31
-msgid "user host port"
-msgstr "uporabnik gostitelj vrata"
-
-#: ../lib/rfc959.c:32
-msgid "user host NOAUTH"
-msgstr "uporabnik gostitelj NOAUTH"
-
-#: ../lib/rfc959.c:33
-msgid "HTTP Proxy"
-msgstr "Posredniški strežnik HTTP"
-
-#: ../lib/rfc959.c:34
-msgid "Custom"
-msgstr "Po meri"
-
-#: ../lib/rfc959.c:43
-msgid "Email address:"
-msgstr "Naslov elektronske pošte:"
-
-#: ../lib/rfc959.c:45
-msgid "This is the password that will be used whenever you log into a remote FTP server as anonymous"
-msgstr "To je geslo, ki bo uporabljeno ob prijavi v oddaljeni strežnik FTP kot brezimnež"
-
-#: ../lib/rfc959.c:59
-msgid "Proxy account:"
-msgstr "Račun posredniškega strežnika:"
-
-#: ../lib/rfc959.c:61
-msgid "Your firewall account (optional)"
-msgstr "Vaš račun požarnega zidu (izbirno)"
-
-#: ../lib/rfc959.c:63
-msgid "Proxy server type:"
-msgstr "Vrsta posredniškega strežnika:"
-
-#: ../lib/rfc959.c:66
-#, no-c-format
-msgid "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement 
string prefixed by a % that will be replaced with the proper data. The first character can be either p for 
proxy or h for the 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 "To določa kakšen način prijave pričakuje vaš posredniški strežnik. Mogoče je določiti zamenjalni niz 
dolžine dveh znakov s predpono %, ki bo bil zamenjan s primernimi podatki. Prva črka je lahko ali p za 
posrednika ali h za gostitelja strežnika FTP. Drug znak je lahko u (uporabnik), p (geslo), h (gostitelj), o 
(vrata) ali a (račun). Tako na primer za določitev uporabnika posrednika vnesite %pu."
-
-#: ../lib/rfc959.c:69
-msgid "Ignore PASV address"
-msgstr "Prezri naslov PASV"
-
-#: ../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 "Izbrana možnost omogoča, da se PASV naslov IP oddaljenega FTP strežnika prezre. Namesto tega pa bo 
uporabljen IP naslov gostitelja. Nastavitev se pogosto uporablja pri usmernikih, ki v odgovoru PASV podajo 
svoj notranji namesto zunanjega naslova IP. "
-
-#: ../lib/rfc959.c:74
-msgid "Passive file transfers"
-msgstr "Pasivni prenosi datotek"
-
-#: ../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. Generally, it is a good idea to keep this enabled unless 
you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open 
up a port on the client side and the remote server will attempt to connect to it."
-msgstr "Izbrana možnost omogoča, da oddaljeni strežnik FTP odpre vrata za podatkovno povezavo. V primeru, da 
ste za požarnim zidom, mora biti ta možnost omogočena. Priporočeno je, da je možnost omogočena, razen v 
primerih povezave s starejšim FTP strežnikom, ki te podpore nima. V primeru da je možnost onemogočena bo gFTP 
odprl vrata na strani odjemalca, oddaljeni strežnik pa se bo z njim povezal."
-
-#: ../lib/rfc959.c:79
-msgid "Resolve Remote Symlinks (LIST -L)"
-msgstr "Razreševanje oddaljenih simbolnih povezav (LIST -L)"
-
-#: ../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 will want to disable this is if the remote FTP server doesn't 
support the -L option to LIST"
-msgstr "Oddaljeni strežnik FTP bo poskusil razrešiti simbolne povezave v seznamu map. V splošnem je dobro to 
omogočiti. To možnost je dobro onemogočiti le, če oddaljeni FTP strežnik ne podpira možnosti -L v LIST"
-
-#: ../lib/rfc959.c:84
-msgid "Transfer files in ASCII mode"
-msgstr "Prenos datotek v načinu ASCII"
-
-#: ../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 text files. If you are transfering from UNIX to UNIX, 
then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
-msgstr "Za prenašanje besedilnih datotek z Windows na UNIX sistem ali obratno, mora biti ta možnost 
omogočena. Sistema uporabljata različen sistem zapisovanja novih vrstic v besedilnih datotekah. Pri prenosu 
iz UNIX na UNIX sistem ta možnost ni zahtevana. V primeru prenosa binarnih podatkov mora biti ta možnost 
onemogočena."
-
-#: ../lib/rfc959.c:381
-#: ../lib/rfc959.c:390
-#: ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849
-#: ../lib/rfc959.c:1414
-#, c-format
-msgid "Invalid response '%c' received from server.\n"
-msgstr "Neveljaven odziv '%c' je bil prejet s strežnika.\n"
-
-#: ../lib/rfc959.c:706
-#: ../lib/socket-connect-gethostbyname.c:120
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Ustvarjanje vtiča IPv4 je spodletelo: %s\n"
-
-#: ../lib/rfc959.c:745
-#: ../lib/rfc959.c:755
-#, c-format
-msgid "Cannot find an IP address in PASV response '%s'\n"
-msgstr "Ni mogoče najti naslova IP v PASV odzivu '%s'\n"
-
-#: ../lib/rfc959.c:775
-#, c-format
-msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
-msgstr "Preziranje IP naslovov v odzivu PASV, povezovanje z %d.%d.%d.%d:%d\n"
-
-#: ../lib/rfc959.c:786
-#: ../lib/rfc959.c:945
-#, c-format
-msgid "Cannot create a data connection: %s\n"
-msgstr "Ni mogoče ustvariti podatkovne povezave: %s\n"
-
-#: ../lib/rfc959.c:798
-#: ../lib/rfc959.c:819
-#: ../lib/rfc959.c:970
-#, c-format
-msgid "Cannot get socket name: %s\n"
-msgstr "Ni mogoče dobiti imena vtiča: %s\n"
-
-#: ../lib/rfc959.c:809
-#: ../lib/rfc959.c:960
-#, c-format
-msgid "Cannot bind a port: %s\n"
-msgstr "Ni mogoče vezati vrat: %s\n"
-
-#: ../lib/rfc959.c:828
-#: ../lib/rfc959.c:979
-#, c-format
-msgid "Cannot listen on port %d: %s\n"
-msgstr "Ni mogoče poslušati na vratih %d: %s\n"
-
-#: ../lib/rfc959.c:876
-#, c-format
-msgid "Failed to create a IPv6 socket: %s\n"
-msgstr "Ustvarjanje vtiča IPv6 je spodletelo: %s\n"
-
-#: ../lib/rfc959.c:895
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
-msgstr "Napaka: Videti je, da povezava ni vzpostavljena preko IPv6. Prekinjanje povezave.\n"
-
-#: ../lib/rfc959.c:923
-#: ../lib/rfc959.c:932
-#, c-format
-msgid "Invalid EPSV response '%s'\n"
-msgstr "Neveljaven EPSV odziv '%s'\n"
-
-#: ../lib/rfc959.c:989
-#, c-format
-msgid "Cannot get address of local socket: %s\n"
-msgstr "Ni mogoče dobiti naslova krajevnega vtiča: %s\n"
-
-#: ../lib/rfc959.c:1076
-#, c-format
-msgid "Cannot accept connection from server: %s\n"
-msgstr "Ni mogoče sprejeti povezave s strežnika: %s\n"
-
-#: ../lib/rfc959.c:1584
-msgid "total"
-msgstr "skupno"
-
-#: ../lib/rfc959.c:1586
-#, c-format
-msgid "Warning: Cannot parse listing %s\n"
-msgstr "Opozorilo: Ni mogoče razčleniti seznama %s\n"
-
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Iskanje %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 "Ni mogoče najti imena gostitelja %s: %s\n"
-
-#: ../lib/socket-connect-getaddrinfo.c:115
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Ni mogoče ustvariti vtiča: %s\n"
-
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Poskušanje %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 "Ni se mogoče povezati z %s: %s\n"
-
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Povezava z %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 "Ni mogoče najdi imena storitve %s/tcp. Preverite datoteko storitev\n"
-
-#: ../lib/sockutils.c:190
-#: ../lib/sockutils.c:268
-#: ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Povezava z %s je zakasnela\n"
-
-#: ../lib/sockutils.c:338
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Ni mogoče dobiti zastavic vtiča: %s\n"
-
-#: ../lib/sockutils.c:352
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Ni mogoče nastaviti vtiča kot ne-blokiranega: %s\n"
-
-#: ../lib/sshv2.c:28
-msgid "SSH"
-msgstr "SSH"
-
-#: ../lib/sshv2.c:31
-msgid "SSH Prog Name:"
-msgstr "Ime programa SSH:"
-
-#: ../lib/sshv2.c:33
-msgid "The path to the SSH executable"
-msgstr "Pot do izvedljive datoteke SSH"
-
-#: ../lib/sshv2.c:34
-msgid "SSH Extra Params:"
-msgstr "Dodatni parametri SSH:"
-
-#: ../lib/sshv2.c:36
-msgid "Extra parameters to pass to the SSH program"
-msgstr "Dodatni parametri za program SSH"
-
-#: ../lib/sshv2.c:38
-msgid "Need SSH User/Pass"
-msgstr "Zahteva uporabniško ime/geslo SSH"
-
-#: ../lib/sshv2.c:41
-msgid "Require a username/password for SSH connections"
-msgstr "Zahtevaj uporabniško ime/geslo za povezave SSH"
-
-#: ../lib/sshv2.c:369
-#, c-format
-msgid "Running program %s\n"
-msgstr "Poganjanje programa %s\n"
-
-#: ../lib/sshv2.c:378
-msgid "Enter passphrase for RSA key"
-msgstr "Vnesite šifrirno frazo za ključ RSA"
-
-#: ../lib/sshv2.c:379
-msgid "Enter passphrase for key '"
-msgstr "Vnesite šifrirno frazo za ključ '"
-
-#: ../lib/sshv2.c:380
-msgid "Password"
-msgstr "Geslo"
-
-#: ../lib/sshv2.c:381
-msgid "password"
-msgstr "geslo"
-
-#: ../lib/sshv2.c:496
-msgid "(yes/no)?"
-msgstr "(da/ne)?"
-
-#: ../lib/sshv2.c:514
-msgid "Enter PASSCODE:"
-msgstr "Vnesite prehodno geslo:"
-
-#: ../lib/sshv2.c:518
-#: ../src/gtk/gtkui.c:142
-#: ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
-msgid "Enter Password"
-msgstr "Vnos gesla"
-
-#: ../lib/sshv2.c:519
-msgid "Enter SecurID Password:"
-msgstr "Vnesite geslo SecurID:"
-
-#: ../lib/sshv2.c:567
-msgid "Error: An incorrect password was entered\n"
-msgstr "Napaka: Vneseno je bilo nepravilno geslo\n"
-
-#: ../lib/sshv2.c:596
-#, c-format
-msgid "%d: Protocol Initialization\n"
-msgstr "%d: Začenjanje protokola\n"
-
-#: ../lib/sshv2.c:600
-#, c-format
-msgid "%d: Protocol version %d\n"
-msgstr "%d: Različica protokola %d\n"
-
-#: ../lib/sshv2.c:609
-#, c-format
-msgid "%d: Open %s\n"
-msgstr "%d: Odpri %s\n"
-
-#: ../lib/sshv2.c:614
-#, c-format
-msgid "%d: Close\n"
-msgstr "%d: Zapri\n"
-
-#: ../lib/sshv2.c:618
-#, c-format
-msgid "%d: Open Directory %s\n"
-msgstr "%d: Odpri mapo %s\n"
-
-#: ../lib/sshv2.c:623
-#, c-format
-msgid "%d: Read Directory\n"
-msgstr "%d: Beri mapo\n"
-
-#: ../lib/sshv2.c:627
-#, c-format
-msgid "%d: Remove file %s\n"
-msgstr "%d: Odstrani datoteko %s\n"
-
-#: ../lib/sshv2.c:632
-#, c-format
-msgid "%d: Make directory %s\n"
-msgstr "%d: Ustvari mapo %s\n"
-
-#: ../lib/sshv2.c:637
-#, c-format
-msgid "%d: Remove directory %s\n"
-msgstr "%d: Odstrani mapo %s\n"
-
-#: ../lib/sshv2.c:642
-#, c-format
-msgid "%d: Realpath %s\n"
-msgstr "%d: Realpath %s\n"
-
-#: ../lib/sshv2.c:647
-#, c-format
-msgid "%d: File attributes\n"
-msgstr "%d: Atributi datotek\n"
-
-#: ../lib/sshv2.c:651
-#, c-format
-msgid "%d: Stat %s\n"
-msgstr "%d Stanje %s\n"
-
-#: ../lib/sshv2.c:671
-#, c-format
-msgid "%d: Chmod %s %o\n"
-msgstr "%d: Chmod %s %o\n"
-
-#: ../lib/sshv2.c:676
-#, c-format
-msgid "%d: Utime %s %d\n"
-msgstr "%d: Utime %s %d\n"
-
-#: ../lib/sshv2.c:690
-#: ../src/gtk/bookmarks.c:1042
-#: ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253
-#: ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995
-#: ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
-msgid "OK"
-msgstr "V redu"
-
-#: ../lib/sshv2.c:693
-msgid "EOF"
-msgstr "EOF"
-
-#: ../lib/sshv2.c:696
-msgid "No such file or directory"
-msgstr "Ni take datoteke ali mape"
-
-#: ../lib/sshv2.c:699
-msgid "Permission denied"
-msgstr "Ni ustreznih dovoljenj"
-
-#: ../lib/sshv2.c:702
-msgid "Failure"
-msgstr "Napaka"
-
-#: ../lib/sshv2.c:705
-msgid "Bad message"
-msgstr "Slabo sporočilo"
-
-#: ../lib/sshv2.c:708
-msgid "No connection"
-msgstr "Ni povezave"
-
-#: ../lib/sshv2.c:711
-msgid "Connection lost"
-msgstr "Povezava je bila izgubljena"
-
-#: ../lib/sshv2.c:714
-msgid "Operation unsupported"
-msgstr "Opravilo ni podprto"
-
-#: ../lib/sshv2.c:717
-msgid "Unknown message returned from server"
-msgstr "Prejeto je bilo neznano sporočilo s strežnika"
-
-#: ../lib/sshv2.c:752
-#, c-format
-msgid "Error: Message size %d too big\n"
-msgstr "Napaka: Velikost sporočila %d je prevelika\n"
-
-#: ../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 "Napaka: Velikost sporočila %d s strežnika je prevelika\n"
-
-#: ../lib/sshv2.c:817
-msgid "There was an error initializing a SSH connection with the remote server. The error message from the 
remote server follows:\n"
-msgstr "Prišlo je do napake pri začenjanju povezave SSL z oddaljenim strežnikom. Sporočilo o napaki z 
oddaljenega strežnika je:\n"
-
-#: ../lib/sshv2.c:1160
-#, c-format
-msgid "Opening SSH connection to %s\n"
-msgstr "Odpiranje povezave SSH na %s\n"
-
-#: ../lib/sshv2.c:1212
-#, c-format
-msgid "Successfully logged into SSH server %s\n"
-msgstr "Uspešna prijava v SSH strežnik %s\n"
-
-#: ../lib/sslcommon.c:31
-msgid "SSL Engine"
-msgstr "SSL pogon"
-
-#: ../lib/sslcommon.c:34
-msgid "SSL Entropy File:"
-msgstr "Datoteka entropije SSL:"
-
-#: ../lib/sslcommon.c:36
-msgid "SSL entropy file"
-msgstr "Datoteka entropije SSL "
-
-#: ../lib/sslcommon.c:37
-msgid "Entropy Seed Length:"
-msgstr "Dolžina semena entropije:"
-
-#: ../lib/sslcommon.c:39
-msgid "The maximum number of bytes to seed the SSL engine with"
-msgstr "Največje število bajtov za sejanje pogona SSL"
-
-#: ../lib/sslcommon.c:41
-#: ../lib/sslcommon.c:43
-msgid "Verify SSL Peer"
-msgstr "Potrdi vrstnika SSL"
-
-#: ../lib/sslcommon.c:107
-#, c-format
-msgid ""
-"Error with certificate at depth: %i\n"
-"Issuer = %s\n"
-"Subject = %s\n"
-"Error %i:%s\n"
-msgstr ""
-"Napaka potrdila na globini: %i\n"
-"Izdajatelj = %s\n"
-"Predmet = %s\n"
-"Napaka %i:%s\n"
-
-#: ../lib/sslcommon.c:129
-msgid "Cannot get peer certificate\n"
-msgstr "Ni mogoče dobiti potrdila vrstnika\n"
-
-#: ../lib/sslcommon.c:196
-#, c-format
-msgid "ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). 
Aborting connection.\n"
-msgstr "Napaka: Gostitelj določen v potrdilu SSL (%s) se ne sklada s povezanim gostiteljem (%s). Prekinjanje 
povezave.\n"
-
-#: ../lib/sslcommon.c:302
-msgid "Cannot initialize the OpenSSL library\n"
-msgstr "Ni mogoče začeti knjižnice OpenSSL\n"
-
-#: ../lib/sslcommon.c:317
-msgid "Error loading default SSL certificates\n"
-msgstr "Napaka med nalaganjem privzetih potrdil SSL\n"
-
-#: ../lib/sslcommon.c:329
-msgid "Error setting cipher list (no valid ciphers)\n"
-msgstr "Napaka med nastavljanjem seznama šifer (ni veljavnih šifer)\n"
-
-#: ../lib/sslcommon.c:349
-#: ../lib/sslcommon.c:423
-#: ../lib/sslcommon.c:471
-msgid "Error: SSL engine was not initialized\n"
-msgstr "Napaka: pogon SSL ni bil začet\n"
-
-#: ../lib/sslcommon.c:366
-msgid "Error setting up SSL connection (BIO object)\n"
-msgstr "Napaka med nastavljanjem povezave SSL (predmet BIO)\n"
-
-#: ../lib/sslcommon.c:376
-msgid "Error setting up SSL connection (SSL object)\n"
-msgstr "Napaka med nastavljanjem povezave SSL (predmet SSL)\n"
-
-#: ../lib/sslcommon.c:397
-#, c-format
-msgid "Error with peer certificate: %s\n"
-msgstr "Napaka s potrdilom vrstnika: %s\n"
-
-#: ../src/uicommon/gftpui.c:56
-msgid "Operation canceled\n"
-msgstr "Opravilo je bilo preklicano\n"
-
-#: ../src/uicommon/gftpui.c:65
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Čakanje %d sekund pred poskusom ponovne povezave\n"
-
-#: ../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 je distribuiran BREZ KAKRŠNIHKOLI zagotovil; podrobnosti so v datoteki COPYING. To je prosto 
programje; lahko ga redistribuirate in/ali spreminjate pod določenimi pogoji. Za podrobnosti si oglejte 
COPYING datoteko\n"
-
-#: ../src/uicommon/gftpui.c:158
-#: ../src/gtk/menu-items.c:491
-msgid "Translated by"
-msgstr "Andrej Žnidaršič <andrej znidarsic gmail com>"
-
-#: ../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 "Napaka: Ni povezave z oddaljeno stranjo\n"
-
-#: ../src/uicommon/gftpui.c:216
-msgid "usage: chmod <mode> <file>\n"
-msgstr "uporaba: chmod <način> <datoteka>\n"
-
-#: ../src/uicommon/gftpui.c:257
-msgid "usage: rename <old name> <new name>\n"
-msgstr "uporaba: rename <staro ime> <novo ime>\n"
-
-#: ../src/uicommon/gftpui.c:293
-msgid "usage: delete <file>\n"
-msgstr "uporaba: delete <datoteka>\n"
-
-#: ../src/uicommon/gftpui.c:328
-msgid "usage: rmdir <directory>\n"
-msgstr "uporaba: rmdir <ime mape>\n"
-
-#: ../src/uicommon/gftpui.c:363
-msgid "usage: site <site command>\n"
-msgstr "uporaba: site <ukaz spletne stani>\n"
-
-#: ../src/uicommon/gftpui.c:399
-msgid "usage: mkdir <new directory>\n"
-msgstr "uporaba mkdir <nova mapa>\n"
-
-#: ../src/uicommon/gftpui.c:435
-#: ../src/uicommon/gftpui.c:453
-msgid "usage: chdir <directory>\n"
-msgstr "uporaba: chdir <mapa>\n"
-
-#: ../src/uicommon/gftpui.c:526
-msgid "Invalid argument\n"
-msgstr "Neveljaven argument\n"
-
-#: ../src/uicommon/gftpui.c:539
-msgid "Clear the directory cache\n"
-msgstr "Počisti predpomnilnik map\n"
-
-#: ../src/uicommon/gftpui.c:628
-msgid "usage: open "
-msgstr "uporaba: open "
-
-#: ../src/uicommon/gftpui.c:704
-msgid "usage: set [variable = value]\n"
-msgstr "uporaba: set [spremenljivka = vrednost]\n"
-
-#: ../src/uicommon/gftpui.c:718
-#, c-format
-msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr "Napaka: Spremenljivka %s ni veljavna nastavitvena spremenljivka.\n"
-
-#: ../src/uicommon/gftpui.c:725
-#, c-format
-msgid "Error: Variable %s is not available in the text port of gFTP\n"
-msgstr "Napaka: Spremenljivka %s ni na voljo v besedni različici gFTP\n"
-
-#: ../src/uicommon/gftpui.c:807
-msgid ""
-"Supported commands:\n"
-"\n"
-msgstr ""
-"Podprti ukazi:\n"
-"\n"
-
-#: ../src/uicommon/gftpui.c:852
-#, c-format
-msgid "usage: %s <filespec>\n"
-msgstr "uporaba: %s <filespec>\n"
-
-#: ../src/uicommon/gftpui.c:937
-msgid "about"
-msgstr "about"
-
-#: ../src/uicommon/gftpui.c:938
-msgid "Shows gFTP information"
-msgstr "Pokaže podrobnosti programa gFTP"
-
-#: ../src/uicommon/gftpui.c:939
-msgid "ascii"
-msgstr "ascii"
-
-#: ../src/uicommon/gftpui.c:940
-msgid "Sets the current file transfer mode to Ascii (only for FTP)"
-msgstr "Spremeni trenutni način prenosa v Ascii (le za FTP)"
-
-#: ../src/uicommon/gftpui.c:941
-msgid "binary"
-msgstr "binary"
-
-#: ../src/uicommon/gftpui.c:942
-msgid "Sets the current file transfer mode to Binary (only for FTP)"
-msgstr "Nastavi trenutni način prenosa v binarnega (le za FTP)"
-
-#: ../src/uicommon/gftpui.c:943
-msgid "cd"
-msgstr "cd"
-
-#: ../src/uicommon/gftpui.c:944
-#: ../src/uicommon/gftpui.c:946
-msgid "Changes the remote working directory"
-msgstr "Spremeni oddaljeno delovno mapo"
-
-#: ../src/uicommon/gftpui.c:945
-msgid "chdir"
-msgstr "chdir"
-
-#: ../src/uicommon/gftpui.c:947
-msgid "chmod"
-msgstr "chmod"
-
-#: ../src/uicommon/gftpui.c:948
-msgid "Changes the permissions of a remote file"
-msgstr "Spremeni dovoljenja oddaljene strani"
-
-#: ../src/uicommon/gftpui.c:949
-msgid "clear"
-msgstr "clear"
-
-#: ../src/uicommon/gftpui.c:950
-msgid "Available options: cache"
-msgstr "Dostopne možnosti: predpomnilnik"
-
-#: ../src/uicommon/gftpui.c:951
-msgid "close"
-msgstr "close"
-
-#: ../src/uicommon/gftpui.c:952
-msgid "Disconnects from the remote site"
-msgstr "Prekine povezavo z oddaljeno stranjo"
-
-#: ../src/uicommon/gftpui.c:953
-msgid "delete"
-msgstr "izbriši"
-
-#: ../src/uicommon/gftpui.c:954
-msgid "Removes a remote file"
-msgstr "Odstrani oddaljeno datoteko"
-
-#: ../src/uicommon/gftpui.c:955
-msgid "dir"
-msgstr "dir"
-
-#: ../src/uicommon/gftpui.c:956
-#: ../src/uicommon/gftpui.c:982
-msgid "Shows the directory listing for the current remote directory"
-msgstr "Pokaže seznam map za trenutno oddaljeno mapo"
-
-#: ../src/uicommon/gftpui.c:957
-msgid "get"
-msgstr "get"
-
-#: ../src/uicommon/gftpui.c:958
-#: ../src/uicommon/gftpui.c:984
-msgid "Downloads remote file(s)"
-msgstr "Prejme oddaljeno/e datoteko/e"
-
-#: ../src/uicommon/gftpui.c:959
-msgid "help"
-msgstr "help"
-
-#: ../src/uicommon/gftpui.c:960
-msgid "Shows this help screen"
-msgstr "Pokaže ta zaslon pomoči"
-
-#: ../src/uicommon/gftpui.c:961
-msgid "lcd"
-msgstr "lcd"
-
-#: ../src/uicommon/gftpui.c:962
-#: ../src/uicommon/gftpui.c:964
-msgid "Changes the local working directory"
-msgstr "Spremeni krajevno delovno mapo"
-
-#: ../src/uicommon/gftpui.c:963
-msgid "lchdir"
-msgstr "lchdir"
-
-#: ../src/uicommon/gftpui.c:965
-msgid "lchmod"
-msgstr "lchmod"
-
-#: ../src/uicommon/gftpui.c:966
-msgid "Changes the permissions of a local file"
-msgstr "Spremeni dovoljenja krajevne datoteke"
-
-#: ../src/uicommon/gftpui.c:967
-msgid "ldelete"
-msgstr "ldelete"
-
-#: ../src/uicommon/gftpui.c:968
-msgid "Removes a local file"
-msgstr "Odstrani krajevno datoteko"
-
-#: ../src/uicommon/gftpui.c:969
-msgid "ldir"
-msgstr "ldir"
-
-#: ../src/uicommon/gftpui.c:970
-#: ../src/uicommon/gftpui.c:972
-msgid "Shows the directory listing for the current local directory"
-msgstr "Pokaže seznam map za trenutno krajevno mapo"
-
-#: ../src/uicommon/gftpui.c:971
-msgid "lls"
-msgstr "lls"
-
-#: ../src/uicommon/gftpui.c:973
-msgid "lmkdir"
-msgstr "lmkdir"
-
-#: ../src/uicommon/gftpui.c:974
-msgid "Creates a local directory"
-msgstr "Ustvari krajevno mapo"
-
-#: ../src/uicommon/gftpui.c:975
-msgid "lpwd"
-msgstr "lpwd"
-
-#: ../src/uicommon/gftpui.c:976
-msgid "Show current local directory"
-msgstr "Pokaže trenutno krajevno mapo"
-
-#: ../src/uicommon/gftpui.c:977
-msgid "lrename"
-msgstr "lrename"
-
-#: ../src/uicommon/gftpui.c:978
-msgid "Rename a local file"
-msgstr "Preimenuje krajevno datoteko"
-
-#: ../src/uicommon/gftpui.c:979
-msgid "lrmdir"
-msgstr "lrmdir"
-
-#: ../src/uicommon/gftpui.c:980
-msgid "Remove a local directory"
-msgstr "Odstrani krajevno mapo"
-
-#: ../src/uicommon/gftpui.c:981
-msgid "ls"
-msgstr "ls"
-
-#: ../src/uicommon/gftpui.c:983
-msgid "mget"
-msgstr "mget"
-
-#: ../src/uicommon/gftpui.c:985
-msgid "mkdir"
-msgstr "mkdir"
-
-#: ../src/uicommon/gftpui.c:986
-msgid "Creates a remote directory"
-msgstr "Ustvari oddaljeno mapo"
-
-#: ../src/uicommon/gftpui.c:987
-msgid "mput"
-msgstr "mput"
-
-#: ../src/uicommon/gftpui.c:988
-#: ../src/uicommon/gftpui.c:992
-msgid "Uploads local file(s)"
-msgstr "Pošlji krajevn(o)/(e) datotek(o)/(e)"
-
-#: ../src/uicommon/gftpui.c:989
-msgid "open"
-msgstr "open"
-
-#: ../src/uicommon/gftpui.c:990
-msgid "Opens a connection to a remote site"
-msgstr "Odpre povezavo z oddaljeno stranjo"
-
-#: ../src/uicommon/gftpui.c:991
-msgid "put"
-msgstr "put"
-
-#: ../src/uicommon/gftpui.c:993
-msgid "pwd"
-msgstr "pwd"
-
-#: ../src/uicommon/gftpui.c:994
-msgid "Show current remote directory"
-msgstr "Pokaže trenutno oddaljeno mapo"
-
-#: ../src/uicommon/gftpui.c:995
-msgid "quit"
-msgstr "končaj"
-
-#: ../src/uicommon/gftpui.c:996
-msgid "Exit from gFTP"
-msgstr "Izhod iz programa gFTP"
-
-#: ../src/uicommon/gftpui.c:997
-msgid "rename"
-msgstr "rename"
-
-#: ../src/uicommon/gftpui.c:998
-msgid "Rename a remote file"
-msgstr "Odstrani oddaljeno datoteko"
-
-#: ../src/uicommon/gftpui.c:999
-msgid "rmdir"
-msgstr "rmdir"
-
-#: ../src/uicommon/gftpui.c:1000
-msgid "Remove a remote directory"
-msgstr "Odstrani oddaljeno mapo"
-
-#: ../src/uicommon/gftpui.c:1001
-msgid "set"
-msgstr "nastavi"
-
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "Prikaži spremenljivke nastavitvenih datotek. Spremenljivke je mogoče nastaviti z var=val"
-
-#: ../src/uicommon/gftpui.c:1004
-msgid "site"
-msgstr "spletišče"
-
-#: ../src/uicommon/gftpui.c:1005
-msgid "Run a site specific command"
-msgstr "Poganjanje določenega ukaza za spletišče"
-
-#: ../src/uicommon/gftpui.c:1094
-msgid "Error: Command not recognized\n"
-msgstr "Napaka: Ukaz ni prepoznan\n"
-
-#: ../src/uicommon/gftpui.c:1304
-#, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "%s uspešno preneseno pri %.2f kB/s\n"
-
-#: ../src/uicommon/gftpui.c:1335
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Spuščanje datoteke %s na gostitelju %s\n"
-
-#: ../src/uicommon/gftpui.c:1359
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Ustavljanje prenosa na gostitelju %s\n"
-
-#: ../src/uicommon/gftpui.c:1505
-#, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Ni mogoče prejeti %s z %s\n"
-
-#: ../src/uicommon/gftpui.c:1561
-#, c-format
-msgid "There were %d files or directories that could not be transferred. Check the log for which items were 
not properly transferred."
-msgstr "%d datotek ali map ni bilo mogoče prenesti. Preverite dnevnik za predmete, ki niso bilo pravilno 
preneseni."
-
-#: ../src/gtk/bookmarks.c:40
-#: ../src/gtk/dnd.c:122
-#: ../src/gtk/gftp-gtk.c:234
-#: ../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: Preden je mogoče narediti kaj drugega, je treba pritisniti gumb zaustavi\n"
-
-#: ../src/gtk/bookmarks.c:41
-msgid "Run Bookmark"
-msgstr "Poženi zaznamek"
-
-#: ../src/gtk/bookmarks.c:71
-msgid "Add Bookmark: You must enter a name for the bookmark\n"
-msgstr "Dodajanje zaznamka: Vnesti morate ime zaznamka\n"
-
-#: ../src/gtk/bookmarks.c:78
-#, c-format
-msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "Dodajanje zaznamka: Zaznamka %s ni mogoče dodati, ker to ime že obstaja\n"
-
-#: ../src/gtk/bookmarks.c:135
-#: ../src/gtk/bookmarks.c:146
-msgid "Add Bookmark"
-msgstr "Dodaj zaznamek"
-
-#: ../src/gtk/bookmarks.c:142
-msgid "Add Bookmark: You must enter a hostname\n"
-msgstr "Dodajanje zaznamka: Vnesti morate ime gostitelja\n"
-
-#: ../src/gtk/bookmarks.c:146
-msgid ""
-"Enter the name of the bookmark you want to add\n"
-"You can separate items by a / to put it into a submenu\n"
-"(ex: Linux Sites/Debian)"
-msgstr ""
-"Vnesite ime zaznamka za dodajanje\n"
-"Predmete je mogoče ločiti z / in jih dodati v podmeni\n"
-"(npr.: Linux Strani/Debian)"
-
-#: ../src/gtk/bookmarks.c:146
-msgid "Remember password"
-msgstr "Zapomni si geslo"
-
-#: ../src/gtk/bookmarks.c:420
-msgid "You must specify a name for the bookmark."
-msgstr "Navesti morate ime zaznamka."
-
-#: ../src/gtk/bookmarks.c:472
-msgid "New Folder"
-msgstr "Nova mapa"
-
-#: ../src/gtk/bookmarks.c:473
-msgid "Enter the name of the new folder to create"
-msgstr "Vnesite ime nove mape"
-
-#: ../src/gtk/bookmarks.c:482
-msgid "New Item"
-msgstr "Nov predmet"
-
-#: ../src/gtk/bookmarks.c:483
-msgid "Enter the name of the new item to create"
-msgstr "Vnesite ime novega predmeta"
-
-#: ../src/gtk/bookmarks.c:556
-#, c-format
-msgid ""
-"Are you sure you want to erase the bookmark\n"
-"%s and all its children?"
-msgstr ""
-"Ali ste prepričani, da želite izbrisati zaznamek\n"
-"%s in vse njegove otroke ?"
-
-#: ../src/gtk/bookmarks.c:557
-msgid "Delete Bookmark"
-msgstr "Izbriši zaznamek"
-
-#: ../src/gtk/bookmarks.c:629
-msgid "Bookmarks"
-msgstr "Zaznamki"
-
-#: ../src/gtk/bookmarks.c:849
-#: ../src/gtk/bookmarks.c:852
-msgid "Edit Entry"
-msgstr "Urejanje vnosa"
-
-#: ../src/gtk/bookmarks.c:888
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../src/gtk/bookmarks.c:903
-msgid "Hostname:"
-msgstr "Ime gostitelja:"
-
-#: ../src/gtk/bookmarks.c:916
-msgid "Port:"
-msgstr "Vrata:"
-
-#: ../src/gtk/bookmarks.c:933
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../src/gtk/bookmarks.c:957
-msgid "Remote Directory:"
-msgstr "Oddaljena mapa:"
-
-#: ../src/gtk/bookmarks.c:970
-msgid "Local Directory:"
-msgstr "Krajevna mapa:"
-
-#: ../src/gtk/bookmarks.c:987
-msgid "Username:"
-msgstr "Uporabniško ime:"
-
-#: ../src/gtk/bookmarks.c:1000
-#: ../src/text/textui.c:92
-msgid "Password:"
-msgstr "Geslo:"
-
-#: ../src/gtk/bookmarks.c:1014
-msgid "Account:"
-msgstr "Račun:"
-
-#: ../src/gtk/bookmarks.c:1028
-msgid "Log in as ANONYMOUS"
-msgstr "Prijava kot brezimnež"
-
-#: ../src/gtk/bookmarks.c:1053
-#: ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265
-#: ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216
-#: ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Prekliči"
-
-#: ../src/gtk/bookmarks.c:1204
-msgid "/_File"
-msgstr "/_Datoteka"
-
-#: ../src/gtk/bookmarks.c:1205
-msgid "/File/tearoff"
-msgstr "/Datoteka/odtrgaj"
-
-#: ../src/gtk/bookmarks.c:1206
-msgid "/File/New _Folder..."
-msgstr "/Datoteka/Nova _mapa ..."
-
-#: ../src/gtk/bookmarks.c:1207
-msgid "/File/New _Item..."
-msgstr "/Datoteka/Nov predme_t ..."
-
-#: ../src/gtk/bookmarks.c:1208
-msgid "/File/_Delete"
-msgstr "/Datoteka/Izbri_ši"
-
-#: ../src/gtk/bookmarks.c:1209
-msgid "/File/_Properties..."
-msgstr "/Datoteka/_Lastnosti ..."
-
-#: ../src/gtk/bookmarks.c:1210
-msgid "/File/sep"
-msgstr "/Datoteka/loči"
-
-#: ../src/gtk/bookmarks.c:1211
-msgid "/File/_Close"
-msgstr "/Datoteka/_Zapri"
-
-#: ../src/gtk/bookmarks.c:1229
-#: ../src/gtk/bookmarks.c:1232
-msgid "Edit Bookmarks"
-msgstr "Uredi zaznamke"
-
-#: ../src/gtk/chmod_dialog.c:132
-#: ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
-msgid "Chmod"
-msgstr "Chmod"
-
-#: ../src/gtk/chmod_dialog.c:162
-msgid ""
-"You can now adjust the attributes of your file(s)\n"
-"Note: Not all ftp servers support the chmod feature"
-msgstr ""
-"Sedaj je mogoče prilagoditi atribute vaših datotek\n"
-"Opomba: Vsi strežniki ftp ne podpirajo ukaza chmod"
-
-#: ../src/gtk/chmod_dialog.c:172
-msgid "Special"
-msgstr "Posebno"
-
-#: ../src/gtk/chmod_dialog.c:180
-msgid "SUID"
-msgstr "SUID"
-
-#: ../src/gtk/chmod_dialog.c:184
-msgid "SGID"
-msgstr "SGID"
-
-#: ../src/gtk/chmod_dialog.c:188
-msgid "Sticky"
-msgstr "Lepljivo"
-
-#: ../src/gtk/chmod_dialog.c:192
-#: ../src/gtk/gftp-gtk.c:789
-msgid "User"
-msgstr "Uporabnik"
-
-#: ../src/gtk/chmod_dialog.c:200
-#: ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
-msgid "Read"
-msgstr "Preberi"
-
-#: ../src/gtk/chmod_dialog.c:204
-#: ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
-msgid "Write"
-msgstr "Zapiši"
-
-#: ../src/gtk/chmod_dialog.c:208
-#: ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
-msgid "Execute"
-msgstr "Izvedi"
-
-#: ../src/gtk/chmod_dialog.c:212
-#: ../src/gtk/gftp-gtk.c:790
-msgid "Group"
-msgstr "Skupina"
-
-#: ../src/gtk/chmod_dialog.c:232
-msgid "Other"
-msgstr "Ostalo"
-
-#: ../src/gtk/delete_dialog.c:61
-#, c-format
-msgid "Are you sure you want to delete these %ld files and %ld directories"
-msgstr "Ali ste prepričani, da želite izbrisati %ld datotek in %ld map"
-
-#: ../src/gtk/delete_dialog.c:65
-#, c-format
-msgid "Are you sure you want to delete these %ld files"
-msgstr "Ali ste prepričani, da želite izbrisati %ld datotek"
-
-#: ../src/gtk/delete_dialog.c:69
-#, c-format
-msgid "Are you sure you want to delete these %ld directories"
-msgstr "Ali ste prepričani, da želite izbrisati %ld map"
-
-#: ../src/gtk/delete_dialog.c:74
-msgid "Delete Files/Directories"
-msgstr "Izbriši datoteke/mape"
-
-#: ../src/gtk/delete_dialog.c:90
-#: ../src/gtk/options_dialog.c:1302
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../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 "Povezava"
-
-#: ../src/gtk/dnd.c:136
-#: ../src/gtk/dnd.c:269
-#, c-format
-msgid "Received URL %s\n"
-msgstr "Prejet URL %s\n"
-
-#: ../src/gtk/dnd.c:159
-#: ../src/gtk/dnd.c:247
-msgid "Drag-N-Drop"
-msgstr "Povleci in spusti"
-
-#: ../src/gtk/gftp-gtk.c:144
-msgid "Exit"
-msgstr "Izhod"
-
-#: ../src/gtk/gftp-gtk.c:144
-msgid ""
-"There are file transfers in progress.\n"
-"Are you sure you want to exit?"
-msgstr ""
-"Trenutno potekajo prenosi datotek.\n"
-"Ali ste prepričani, da želite zapreti program?"
-
-#: ../src/gtk/gftp-gtk.c:219
-#: ../src/gtk/gftp-gtk.c:235
-msgid "Open Location"
-msgstr "Odpri mesto"
-
-#: ../src/gtk/gftp-gtk.c:219
-msgid "Enter a URL to connect to"
-msgstr "Vnesite URL za povezavo"
-
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/_FTP"
-msgstr "/_FTP"
-
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/FTP/tearoff"
-msgstr "/FTP/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/FTP/Window _1"
-msgstr "/FTP/Okno _1"
-
-#: ../src/gtk/gftp-gtk.c:269
-msgid "/FTP/Window _2"
-msgstr "/FTP/Okno _2"
-
-#: ../src/gtk/gftp-gtk.c:271
-#: ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/FTP/sep"
-msgstr "/FTP/loči"
-
-#: ../src/gtk/gftp-gtk.c:272
-msgid "/FTP/_Ascii"
-msgstr "/FTP/_Ascii"
-
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/FTP/_Binary"
-msgstr "/FTP/_Binarno"
-
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/FTP/_Preferences..."
-msgstr "/FTP/_Možnosti ..."
-
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/FTP/_Quit"
-msgstr "/FTP/_Končaj"
-
-#: ../src/gtk/gftp-gtk.c:281
-msgid "/_Local"
-msgstr "/_Krajevno"
-
-#: ../src/gtk/gftp-gtk.c:282
-msgid "/Local/tearoff"
-msgstr "/Krajevno/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Local/_Open Location..."
-msgstr "/Krajevno/_Odpri mesto ..."
-
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Local/D_isconnect"
-msgstr "/Krajevno/P_rekini povezavo"
-
-#: ../src/gtk/gftp-gtk.c:286
-#: ../src/gtk/gftp-gtk.c:293
-msgid "/Local/sep"
-msgstr "/Krajevno/loči"
-
-#: ../src/gtk/gftp-gtk.c:287
-msgid "/Local/Change _Filespec..."
-msgstr "/Krajevno/Spremeni določilo datoteke ..."
-
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Local/_Show selected"
-msgstr "/Krajevno/_Pokaži izbrane"
-
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Local/Select _All"
-msgstr "/Krajevno/Izberi vs_e"
-
-#: ../src/gtk/gftp-gtk.c:291
-msgid "/Local/Select All Files"
-msgstr "/Krajevno/Izberi vse datoteke"
-
-#: ../src/gtk/gftp-gtk.c:292
-msgid "/Local/Deselect All"
-msgstr "/Krajevno/Odstrani izbor vsega"
-
-#: ../src/gtk/gftp-gtk.c:294
-msgid "/Local/Save Directory Listing..."
-msgstr "/Krajevno/Shrani seznam map ..."
-
-#: ../src/gtk/gftp-gtk.c:295
-msgid "/Local/Send SITE Command..."
-msgstr "/Krajevno/Pošlji ukaz SITE ..."
-
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Local/_Change Directory"
-msgstr "/Krajevno/Spremeni ma_po"
-
-#: ../src/gtk/gftp-gtk.c:297
-msgid "/Local/_Permissions..."
-msgstr "/Krajevno/Dovo_ljenja ..."
-
-#: ../src/gtk/gftp-gtk.c:299
-msgid "/Local/_New Folder..."
-msgstr "/Krajevno/_Nova mapa ..."
-
-#: ../src/gtk/gftp-gtk.c:300
-msgid "/Local/Rena_me..."
-msgstr "/Krajevno/Prei_menuj ..."
-
-#: ../src/gtk/gftp-gtk.c:302
-msgid "/Local/_Delete..."
-msgstr "/Krajevno/Iz_briši ..."
-
-#: ../src/gtk/gftp-gtk.c:304
-msgid "/Local/_Edit..."
-msgstr "/Krajevno/Ur_edi ..."
-
-#: ../src/gtk/gftp-gtk.c:305
-msgid "/Local/_View..."
-msgstr "/Krajevno/Po_gled ..."
-
-#: ../src/gtk/gftp-gtk.c:306
-msgid "/Local/_Refresh"
-msgstr "/Krajevno/_Osveži"
-
-#: ../src/gtk/gftp-gtk.c:308
-msgid "/_Remote"
-msgstr "/_Oddaljeno"
-
-#: ../src/gtk/gftp-gtk.c:309
-msgid "/Remote/tearoff"
-msgstr "/Oddaljeno/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:310
-msgid "/Remote/_Open Location..."
-msgstr "/Oddaljeno/_Odpri mesto ..."
-
-#: ../src/gtk/gftp-gtk.c:312
-msgid "/Remote/D_isconnect"
-msgstr "/Oddaljeno/Prek_ini povezavo"
-
-#: ../src/gtk/gftp-gtk.c:314
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Remote/sep"
-msgstr "/Oddaljeno/loči"
-
-#: ../src/gtk/gftp-gtk.c:315
-msgid "/Remote/Change _Filespec..."
-msgstr "/Oddaljeno/Spremeni določilo datoteke ..."
-
-#: ../src/gtk/gftp-gtk.c:317
-msgid "/Remote/_Show selected"
-msgstr "/Oddaljeno/_Pokaži izbrano"
-
-#: ../src/gtk/gftp-gtk.c:318
-msgid "/Remote/Select _All"
-msgstr "/Oddaljeno/Izberi _vse"
-
-#: ../src/gtk/gftp-gtk.c:319
-msgid "/Remote/Select All Files"
-msgstr "/Oddaljeno/Izberi vse datoteke"
-
-#: ../src/gtk/gftp-gtk.c:320
-msgid "/Remote/Deselect All"
-msgstr "/Oddaljeno/Odstrani izbor vsega"
-
-#: ../src/gtk/gftp-gtk.c:322
-msgid "/Remote/Save Directory Listing..."
-msgstr "/Oddaljeno/Shrani seznam map ..."
-
-#: ../src/gtk/gftp-gtk.c:323
-msgid "/Remote/Send SITE Command..."
-msgstr "/Oddaljeno/Pošlji ukaz SITE ..."
-
-#: ../src/gtk/gftp-gtk.c:324
-msgid "/Remote/_Change Directory"
-msgstr "/Oddaljeno/Sp_remeni mapo"
-
-#: ../src/gtk/gftp-gtk.c:325
-msgid "/Remote/_Permisssions..."
-msgstr "/Oddaljeno/Do_voljenja ..."
-
-#: ../src/gtk/gftp-gtk.c:326
-msgid "/Remote/_New Folder..."
-msgstr "/Oddaljeno/_Nova mapa ..."
-
-#: ../src/gtk/gftp-gtk.c:328
-msgid "/Remote/Rena_me..."
-msgstr "/Oddaljeno/Prei_menuj ..."
-
-#: ../src/gtk/gftp-gtk.c:330
-msgid "/Remote/_Delete..."
-msgstr "/Oddaljeno/Iz_briši ..."
-
-#: ../src/gtk/gftp-gtk.c:331
-msgid "/Remote/_Edit..."
-msgstr "/Odaljeno/Ur_edi ..."
-
-#: ../src/gtk/gftp-gtk.c:332
-msgid "/Remote/_View..."
-msgstr "/Oddaljeno/_Pogled ..."
-
-#: ../src/gtk/gftp-gtk.c:333
-msgid "/Remote/_Refresh"
-msgstr "/Oddaljeno/Osve_ži"
-
-#: ../src/gtk/gftp-gtk.c:335
-msgid "/_Bookmarks"
-msgstr "/_Zaznamki"
-
-#: ../src/gtk/gftp-gtk.c:336
-msgid "/Bookmarks/tearoff"
-msgstr "/Zaznamki/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:337
-msgid "/Bookmarks/Add _Bookmark"
-msgstr "/Zaznamki/Dodaj zaz_namek"
-
-#: ../src/gtk/gftp-gtk.c:339
-msgid "/Bookmarks/Edit Bookmarks"
-msgstr "/Zaznamki/Uredi zaznamke"
-
-#: ../src/gtk/gftp-gtk.c:340
-msgid "/Bookmarks/sep"
-msgstr "/Zaznamki/loči"
-
-#: ../src/gtk/gftp-gtk.c:341
-msgid "/_Transfer"
-msgstr "/_Prenos"
-
-#: ../src/gtk/gftp-gtk.c:342
-msgid "/Transfer/tearoff"
-msgstr "/Prenos/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:343
-msgid "/Transfer/_Start"
-msgstr "/Prenos/_Začni"
-
-#: ../src/gtk/gftp-gtk.c:344
-msgid "/Transfer/St_op"
-msgstr "/Prenos/Zaust_avi"
-
-#: ../src/gtk/gftp-gtk.c:346
-#: ../src/gtk/gftp-gtk.c:354
-msgid "/Transfer/sep"
-msgstr "/Prenos/loči"
-
-#: ../src/gtk/gftp-gtk.c:347
-msgid "/Transfer/Skip _Current File"
-msgstr "/Prenos/_Preskoči trenutno datoteko"
-
-#: ../src/gtk/gftp-gtk.c:348
-msgid "/Transfer/_Remove File"
-msgstr "/Prenos/Odst_rani datoteko"
-
-#: ../src/gtk/gftp-gtk.c:350
-msgid "/Transfer/Move File _Up"
-msgstr "/Prenos/Premakni datoteko navz_gor"
-
-#: ../src/gtk/gftp-gtk.c:352
-msgid "/Transfer/Move File _Down"
-msgstr "/Prenos/Premakni datoteko navz_dol"
-
-#: ../src/gtk/gftp-gtk.c:355
-msgid "/Transfer/_Retrieve Files"
-msgstr "/Prenos/P_ridobi datoteke"
-
-#: ../src/gtk/gftp-gtk.c:356
-msgid "/Transfer/_Put Files"
-msgstr "/Prenos/Nalo_ži datoteke"
-
-#: ../src/gtk/gftp-gtk.c:357
-msgid "/L_og"
-msgstr "/D_nevnik"
-
-#: ../src/gtk/gftp-gtk.c:358
-msgid "/Log/tearoff"
-msgstr "/Dnevnik/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:359
-msgid "/Log/_Clear"
-msgstr "/Dnevnik/Po_čisti"
-
-#: ../src/gtk/gftp-gtk.c:360
-msgid "/Log/_View"
-msgstr "/Dnevnik/Po_glej"
-
-#: ../src/gtk/gftp-gtk.c:361
-msgid "/Log/_Save..."
-msgstr "/Dnevnik/_Shrani ..."
-
-#: ../src/gtk/gftp-gtk.c:362
-msgid "/Tool_s"
-msgstr "/Orod_ja"
-
-#: ../src/gtk/gftp-gtk.c:363
-msgid "/Tools/tearoff"
-msgstr "/Orodja/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:364
-msgid "/Tools/C_ompare Windows"
-msgstr "/Orodja/Primerjaj o_kna"
-
-#: ../src/gtk/gftp-gtk.c:365
-msgid "/Tools/_Clear Cache"
-msgstr "/Orodja/Počisti pomni_lnik"
-
-#: ../src/gtk/gftp-gtk.c:366
-msgid "/Help"
-msgstr "/Pomoč"
-
-#: ../src/gtk/gftp-gtk.c:367
-msgid "/Help/tearoff"
-msgstr "/Pomoč/odtrgaj"
-
-#: ../src/gtk/gftp-gtk.c:368
-msgid "/Help/_About"
-msgstr "/Pomoč/O progr_amu"
-
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Gostitelj:"
-
-#: ../src/gtk/gftp-gtk.c:490
-msgid "_Host: "
-msgstr "Gos_titelj:"
-
-#: ../src/gtk/gftp-gtk.c:516
-msgid "Port: "
-msgstr "Vrata: "
-
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Uporabniško ime:"
-
-#: ../src/gtk/gftp-gtk.c:539
-msgid "_User: "
-msgstr "_Uporabnik:"
-
-#: ../src/gtk/gftp-gtk.c:564
-msgid "Pass: "
-msgstr "Geslo:"
-
-#: ../src/gtk/gftp-gtk.c:636
-msgid "Command: "
-msgstr "Ukaz:"
-
-#: ../src/gtk/gftp-gtk.c:787
-#: ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#: ../src/gtk/gftp-gtk.c:788
-msgid "Size"
-msgstr "Velikost"
-
-#: ../src/gtk/gftp-gtk.c:791
-msgid "Date"
-msgstr "Datum"
-
-#: ../src/gtk/gftp-gtk.c:792
-msgid "Attribs"
-msgstr "Atributi"
-
-#: ../src/gtk/gftp-gtk.c:997
-msgid "Progress"
-msgstr "Napredek"
-
-#: ../src/gtk/gftp-gtk.c:1133
-msgid "Error: You must type in a host to connect to\n"
-msgstr "Napaka: Treba je vnesti vrsto gostitelja za povezavo\n"
-
-#: ../src/gtk/gtkui.c:53
-msgid "Refresh"
-msgstr "Osveži"
-
-#: ../src/gtk/gtkui.c:120
-msgid "Enter Username"
-msgstr "Vnos uporabniškega imena"
-
-#: ../src/gtk/gtkui.c:121
-msgid "Please enter your username for this site"
-msgstr "Vnesite svoje uporabniško ime za to spletišče"
-
-#: ../src/gtk/gtkui.c:143
-#: ../src/gtk/transfer.c:563
-#: ../src/gtk/transfer.c:573
-msgid "Please enter your password for this site"
-msgstr "Vnesite svoje geslo za to spletišče"
-
-#: ../src/gtk/gtkui.c:298
-msgid "Operation canceled...you must enter a string\n"
-msgstr "Dejanje je preklicano ... vnesti morate niz\n"
-
-#: ../src/gtk/gtkui.c:344
-msgid "Mkdir"
-msgstr "Mkdir"
-
-#: ../src/gtk/gtkui.c:347
-msgid "Make Directory"
-msgstr "Ustvari mapo"
-
-#: ../src/gtk/gtkui.c:347
-msgid "Enter name of directory to create"
-msgstr "Vnesite ime mape za ustvarjanje"
-
-#: ../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 "Preimenuj"
-
-#: ../src/gtk/gtkui.c:380
-#, c-format
-msgid "What would you like to rename %s to?"
-msgstr "Kakšno naj bo novo ime %s?"
-
-#: ../src/gtk/gtkui.c:402
-#: ../src/gtk/gtkui.c:405
-msgid "Site"
-msgstr "Spletišče"
-
-#: ../src/gtk/gtkui.c:405
-msgid "Enter site-specific command"
-msgstr "Vnesite ukaz specifične za stran"
-
-#: ../src/gtk/gtkui.c:406
-msgid "Prepend with SITE"
-msgstr "Predpona s stranjo"
-
-#: ../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:473
-#: ../src/gtk/transfer.c:541
-#: ../src/gtk/transfer.c:998
-msgid "Skipped"
-msgstr "Preskočeno"
-
-#: ../src/gtk/gtkui_transfer.c:62
-#: ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
-msgid "Waiting..."
-msgstr "Čakanje ..."
-
-#: ../src/gtk/gtkui_transfer.c:136
-#: ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
-msgid "Overwrite"
-msgstr "Prepiši"
-
-#: ../src/gtk/gtkui_transfer.c:143
-#: ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
-msgid "Resume"
-msgstr "Nadaljuj"
-
-#: ../src/gtk/gtkui_transfer.c:150
-#: ../src/gtk/gtkui_transfer.c:317
-msgid "Skip"
-msgstr "Preskoči"
-
-#: ../src/gtk/gtkui_transfer.c:231
-msgid "Action"
-msgstr "Dejanje"
-
-#: ../src/gtk/gtkui_transfer.c:236
-#: ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
-msgid "Transfer Files"
-msgstr "Prenos datotek"
-
-#: ../src/gtk/gtkui_transfer.c:257
-msgid ""
-"The following file(s) exist on both the local and remote computer\n"
-"Please select what you would like to do"
-msgstr ""
-"Naslednje datoteke obstajajo na krajevnem in oddaljenem računalniku\n"
-"Izberite ustrezno dejanje"
-
-#: ../src/gtk/gtkui_transfer.c:323
-msgid "Error"
-msgstr "Napaka"
-
-#: ../src/gtk/gtkui_transfer.c:353
-msgid "Skip File"
-msgstr "Preskoči datoteko"
-
-#: ../src/gtk/gtkui_transfer.c:363
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: ../src/gtk/gtkui_transfer.c:369
-msgid "Deselect All"
-msgstr "Odstrani izbor vsega"
-
-#: ../src/gtk/menu-items.c:65
-msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Sprememba določil: Dejanje je prekinjeno ... vnesti morate niz\n"
-
-#: ../src/gtk/menu-items.c:83
-#: ../src/gtk/menu-items.c:86
-msgid "Change Filespec"
-msgstr "Sprememba določil datoteke"
-
-#: ../src/gtk/menu-items.c:86
-msgid "Enter the new file specification"
-msgstr "Vnesite novo določilo datoteke"
-
-#: ../src/gtk/menu-items.c:114
-#: ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363
-#: ../src/gtk/view_dialog.c:81
-#, c-format
-msgid "Error: Cannot open %s for writing: %s\n"
-msgstr "Napaka: Ni mogoče odpreti %s za pisanje: %s\n"
-
-#: ../src/gtk/menu-items.c:143
-msgid "Save Directory Listing"
-msgstr "Shranjevanje seznama map"
-
-#: ../src/gtk/menu-items.c:327
-#: ../src/gtk/menu-items.c:391
-#, c-format
-msgid "Error: Error writing to %s: %s\n"
-msgstr "Napaka: Napaka med pisanjem v %s: %s\n"
-
-#: ../src/gtk/menu-items.c:402
-#, c-format
-msgid "Successfully wrote the log file to %s\n"
-msgstr "Dnevniška datoteka je bila uspešno zapisana v %s\n"
-
-#: ../src/gtk/menu-items.c:414
-msgid "Save Log"
-msgstr "Shrani dnevnik"
-
-#: ../src/gtk/menu-items.c:450
-#, c-format
-msgid "Cannot find the license agreement file COPYING. Please make sure it is in either %s or in %s"
-msgstr "Ni mogoče najti datoteke o licenčnem dogovoru COPYING. Treba se je prepričati, da je v %s ali %s"
-
-#: ../src/gtk/menu-items.c:454
-#: ../src/gtk/menu-items.c:459
-msgid "About gFTP"
-msgstr "O gFTP"
-
-#: ../src/gtk/menu-items.c:490
-#, c-format
-msgid ""
-"%s\n"
-"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
-"Official Homepage: http://www.gftp.org/\n";
-msgstr ""
-"%s\n"
-"Avtorske pravice (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
-"Uradna domača stran: http://www.gftp.org/\n";
-
-#: ../src/gtk/menu-items.c:503
-msgid "About"
-msgstr "O programu"
-
-#: ../src/gtk/menu-items.c:552
-msgid "License Agreement"
-msgstr "Licenčni dogovor"
-
-#: ../src/gtk/menu-items.c:558
-#: ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr " Zapri "
-
-#: ../src/gtk/menu-items.c:685
-msgid "Compare Windows"
-msgstr "Primerjaj okna"
-
-#: ../src/gtk/misc-gtk.c:257
-msgid "Disconnect from the remote server"
-msgstr "Prekini povezavo z oddaljenim strežnikom"
-
-#: ../src/gtk/misc-gtk.c:261
-msgid "Connect to the site specified in the host entry. If the host entry is blank, then a dialog is 
presented that will allow you to enter a URL."
-msgstr "Povezava do strani navedene v vnosu gostiteljev. Če je vnos gostitelja prazen, se prikaže pogovorno 
okno, ki omogoča vnos URL-ja."
-
-#: ../src/gtk/misc-gtk.c:308
-msgid "All Files"
-msgstr "Vse datoteke"
-
-#: ../src/gtk/misc-gtk.c:318
-msgid "] (Cached) ["
-msgstr "] (V pomnilniku) ["
-
-#: ../src/gtk/misc-gtk.c:329
-msgid "Not connected"
-msgstr "Ni povezave"
-
-#: ../src/gtk/misc-gtk.c:431
-#, c-format
-msgid "Error opening file %s: %s\n"
-msgstr "Napaka med odpiranjem datoteke %s: %s\n"
-
-#: ../src/gtk/misc-gtk.c:521
-#, c-format
-msgid "%s: Not connected to a remote site\n"
-msgstr "%s: Ni povezave z oddaljenim spletiščem\n"
-
-#: ../src/gtk/misc-gtk.c:528
-#, c-format
-msgid "%s: This feature is not available using this protocol\n"
-msgstr "%s: Ta zmožnost pri uporabi tega protokola ni na voljo\n"
-
-#: ../src/gtk/misc-gtk.c:536
-#, c-format
-msgid "%s: You must only have one item selected\n"
-msgstr "%s: Izbran mora natanko en predmet\n"
-
-#: ../src/gtk/misc-gtk.c:543
-#, c-format
-msgid "%s: You must have at least one item selected\n"
-msgstr "%s: Izbran mora biti vsaj en predmet\n"
-
-#: ../src/gtk/misc-gtk.c:926
-#: ../src/gtk/misc-gtk.c:1001
-msgid "Change"
-msgstr "Spremeni"
-
-#: ../src/gtk/misc-gtk.c:998
-#: ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "   Da"
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Ne "
-
-#: ../src/gtk/misc-gtk.c:1164
-msgid "Getting directory listings"
-msgstr "Pridobivanje seznama map"
-
-#: ../src/gtk/misc-gtk.c:1184
-msgid "  Stop  "
-msgstr "  Zaustavi "
-
-#: ../src/gtk/misc-gtk.c:1194
-#, c-format
-msgid ""
-"Received %ld directories\n"
-"and %ld files"
-msgstr ""
-"Prejetih je bilo %ld map\n"
-"in %ld datotek"
-
-#: ../src/gtk/misc-gtk.c:1270
-#, c-format
-msgid "gFTP Error: Cannot find file %s in %s or %s\n"
-msgstr "Napaka gFTP: Ni mogoče najti datoteke %s v %s ali %s\n"
-
-#: ../src/gtk/options_dialog.c:956
-msgid "Edit Host"
-msgstr "Urejanje gostitelja"
-
-#: ../src/gtk/options_dialog.c:956
-msgid "Add Host"
-msgstr "Dodajanje gostitelja"
-
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../src/gtk/options_dialog.c:1004
-msgid "_Type:"
-msgstr "Vrs_ta:"
-
-#: ../src/gtk/options_dialog.c:1014
-#: ../src/gtk/options_dialog.c:1137
-msgid "Domain"
-msgstr "Domena"
-
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Omrežni naslov"
-
-#: ../src/gtk/options_dialog.c:1049
-msgid "_Network address:"
-msgstr "Omrež_ni naslov:"
-
-#: ../src/gtk/options_dialog.c:1088
-#: ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Omrežna maska"
-
-#: ../src/gtk/options_dialog.c:1090
-msgid "N_etmask:"
-msgstr "Omrežna _maska:"
-
-#: ../src/gtk/options_dialog.c:1139
-msgid "_Domain:"
-msgstr "_Domena:"
-
-#: ../src/gtk/options_dialog.c:1247
-msgid "Local Hosts"
-msgstr "Krajevni gostitelji"
-
-#: ../src/gtk/options_dialog.c:1288
-#: ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Uredi"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../src/gtk/options_dialog.c:1367
-#: ../src/gtk/options_dialog.c:1372
-msgid "Options"
-msgstr "Možnosti"
-
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Uveljavi"
-
-#: ../src/gtk/transfer.c:30
-msgid "Receiving file names..."
-msgstr "Prejemanje imen datotek ..."
-
-#: ../src/gtk/transfer.c:63
-#: ../src/gtk/transfer.c:689
-msgid "Connecting..."
-msgstr "Povezovanje ..."
-
-#: ../src/gtk/transfer.c:99
-msgid "Retrieve Files: Not connected to a remote site\n"
-msgstr "Pridobivanje datotek: Ni povezave z oddaljeno stranjo\n"
-
-#: ../src/gtk/transfer.c:336
-#, c-format
-msgid "Error: Child %d returned %d\n"
-msgstr "Napaka: Podrejeno opravilo %d je vrnilo napako %d\n"
-
-#: ../src/gtk/transfer.c:345
-#, c-format
-msgid "Child %d returned successfully\n"
-msgstr "Podrejeno opravilo %d se je uspešno vrnilo\n"
-
-#: ../src/gtk/transfer.c:352
-#, c-format
-msgid "Error: Child %d did not terminate properly\n"
-msgstr "Napaka: Podrejeno opravilo %d se ni primerno končalo\n"
-
-#: ../src/gtk/transfer.c:368
-#, c-format
-msgid "Error: Cannot get information about file %s: %s\n"
-msgstr "Napaka: Ni mogoče dobiti podatkov o datoteki %s: %s\n"
-
-#: ../src/gtk/transfer.c:374
-#, c-format
-msgid "File %s was not changed\n"
-msgstr "Datoteka %s ni bila spremenjena\n"
-
-#: ../src/gtk/transfer.c:382
-#, c-format
-msgid ""
-"File %s has changed.\n"
-"Would you like to upload it?"
-msgstr ""
-"Datoteka %s je bila spremenjena.\n"
-"Ali jo želite poslati ?"
-
-#: ../src/gtk/transfer.c:385
-msgid "Edit File"
-msgstr "Urejanje datoteke"
-
-#: ../src/gtk/transfer.c:476
-msgid "Finished"
-msgstr "Končano"
-
-#: ../src/gtk/transfer.c:734
-#, c-format
-msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "Poslano %s od %s pri %.2fkB/s, %02d:%02d:%02d ocenjen preostali čas"
-
-#: ../src/gtk/transfer.c:739
-#, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "Prejeto %s od %s pri %.2fkB/s, %02d:%02d:%02d ocenjen preostali čas"
-
-#: ../src/gtk/transfer.c:750
-#, c-format
-msgid "Sent %s of %s, transfer stalled, unknown time remaining"
-msgstr "Poslano %s od %s, prenos je zastal, neznan preostali čas"
-
-#: ../src/gtk/transfer.c:756
-#, c-format
-msgid "Recv %s of %s, transfer stalled, unknown time remaining"
-msgstr "Prejeto %s od %s, prenos je zastal, neznan preostali čas"
-
-#: ../src/gtk/transfer.c:800
-#, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
-msgstr "Neznan odstotek je končan. (Datoteka %ld od %ld)"
-
-#: ../src/gtk/transfer.c:804
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "%d%% končano, %02d:%02d:%02d ocenjen preostali čas. (Datoteka %ld od %ld)"
-
-#: ../src/gtk/transfer.c:842
-#, c-format
-msgid "Retrieving file names...%s bytes"
-msgstr "Pridobivanje imen datotek ... %s bajtov"
-
-#: ../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 "Izbran ni noben prenos podatkov\n"
-
-#: ../src/gtk/view_dialog.c:34
-msgid "View"
-msgstr "Pogled"
-
-#: ../src/gtk/view_dialog.c:49
-#, c-format
-msgid "View: %s is a directory. Cannot view it.\n"
-msgstr "Pogled: %s je mapa. Ni je mogoče ogledati.\n"
-
-#: ../src/gtk/view_dialog.c:52
-#, c-format
-msgid "Edit: %s is a directory. Cannot edit it.\n"
-msgstr "Urejanje: %s je mapa. Ni je mogoče urejati.\n"
-
-#: ../src/gtk/view_dialog.c:123
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Urejanje: V pogovornem oknu nastavitev je treba navesti urejevalnik\n"
-
-#: ../src/gtk/view_dialog.c:177
-#, c-format
-msgid "View: Cannot fork another process: %s\n"
-msgstr "Pogled: Ni mogoče vejiti drugega opravila: %s\n"
-
-#: ../src/gtk/view_dialog.c:180
-#, c-format
-msgid "Running program: %s %s\n"
-msgstr "Poganjanje programa: %s %s\n"
-
-#: ../src/gtk/view_dialog.c:240
-#, c-format
-msgid "Opening %s with %s\n"
-msgstr "Odpiranje %s z %s\n"
-
-#: ../src/gtk/view_dialog.c:282
-#, c-format
-msgid "Viewing file %s\n"
-msgstr "Ogledovanje datoteke %s\n"
-
-#: ../src/gtk/view_dialog.c:289
-#, c-format
-msgid "View: Cannot open file %s: %s\n"
-msgstr "Pogled: Ni mogoče odpreti datoteke %s: %s\n"
-
-#: ../src/text/gftp-text.c:166
-#, c-format
-msgid "Cannot open controlling terminal %s\n"
-msgstr "Ni mogoče odpreti nadzornega terminala %s\n"
-
-#: ../src/text/textui.c:80
-msgid "Username [anonymous]:"
-msgstr "Uporabniško ime [brezimno]:"
-
-#: ../src/text/textui.c:158
-#, c-format
-msgid ""
-"%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
-msgstr ""
-"%s že obstaja. (%s velikost vira, %s velikost cilja):\n"
-"(p)repiši, (n)adaljuj, pre(s)koči, (P)repiši vse, (N)adaljuj vse, Pre(S)koči vse: (%c)"
-
+#: lib/protocols.c:1634 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 "Napaka: Ni mogoče nastaviti zastavice za zapiranje ob izvajanju: %s\n"
+
+#: lib/pty.c:301
+#, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Ni mogoče odpreti glavnega pty %s: %s\n"
+
+#: lib/pty.c:309
+#, c-format
+msgid "Cannot create a socket pair: %s\n"
+msgstr "Ni mogoče ustvariti para vtičev: %s\n"
+
+#: lib/pty.c:338
+#, c-format
+msgid "Error: Cannot execute ssh: %s\n"
+msgstr "Napaka: Ni mogoče izvesti ssh: %s\n"
+
+#: lib/pty.c:354
+#, c-format
+msgid "Cannot fork another process: %s\n"
+msgstr "Ni mogoče vejiti drugega opravila: %s\n"
+
+#: lib/rfc2068.c:30 lib/rfc959.c:47
+msgid "Proxy hostname:"
+msgstr "Ime gostitelja posredniškega strežnika:"
+
+#: lib/rfc2068.c:32 lib/rfc959.c:49
+msgid "Firewall hostname"
+msgstr "Ime gostitelja požarnega zidu"
+
+#: lib/rfc2068.c:33 lib/rfc959.c:50
+msgid "Proxy port:"
+msgstr "Vrata posredniškega strežnika:"
+
+#: lib/rfc2068.c:35 lib/rfc959.c:52
+msgid "Port to connect to on the firewall"
+msgstr "Vrata za povezavo na požarnem zidu"
+
+#: lib/rfc2068.c:36 lib/rfc959.c:53
+msgid "Proxy username:"
+msgstr "Uporabniško ime posredniškega strežnika:"
+
+#: lib/rfc2068.c:38 lib/rfc959.c:55
+msgid "Your firewall username"
+msgstr "Uporabniško ime požarnega zidu"
+
+#: lib/rfc2068.c:39 lib/rfc959.c:56
+msgid "Proxy password:"
+msgstr "Geslo posredniškega strežnika:"
+
+#: lib/rfc2068.c:41 lib/rfc959.c:58
+msgid "Your firewall password"
+msgstr "Vaše geslo požarnega zidu"
+
+#: lib/rfc2068.c:43
+msgid "Use HTTP/1.1"
+msgstr "Uporabi HTTP/1.1"
+
+#: lib/rfc2068.c:46
+msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
+msgstr "Želite uporabljati HTTP/1.1 ali HTTP/1.0"
+
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
+#, c-format
+msgid ""
+"Received wrong response from server, disconnecting\n"
+"Invalid chunk size '%s' returned by the remote server\n"
+msgstr ""
+"Prejet je bil napačen odziv s strežnika, prekinjanje povezave\n"
+"Oddaljeni strežnik je vrnil neveljavno velikost rezine '%s'\n"
+
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
+#, c-format
+msgid "Disconnecting from site %s\n"
+msgstr "Prekinjanje povezave s stranjo %s\n"
+
+#: lib/rfc2068.c:301
+msgid "Starting the file transfer at offset "
+msgstr "Začenjanje prenosa datoteke z zamikom"
+
+#: lib/rfc2068.c:322
+#, c-format
+msgid "Cannot retrieve file %s\n"
+msgstr "Ni mogoče pridobiti datoteke %s\n"
+
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
+msgid "Retrieving directory listing...\n"
+msgstr "Pridobivanje seznama map ...\n"
+
+#: lib/rfc2068.c:816 lib/sshv2.c:895
+msgid "Received wrong response from server, disconnecting\n"
+msgstr "Prejet je bil napačen odziv s strežnika, prekinjanje povezave\n"
+
+#: lib/rfc959.c:27
+msgid "SITE command"
+msgstr "Ukaz SITE"
+
+#: lib/rfc959.c:28
+msgid "user host"
+msgstr "uporabnik gostitelj"
+
+#: lib/rfc959.c:29
+msgid "user host:port"
+msgstr "uporabnik gostitelj:vrata"
+
+#: lib/rfc959.c:30
+msgid "AUTHENTICATE"
+msgstr "OVERI"
+
+#: lib/rfc959.c:31
+msgid "user host port"
+msgstr "uporabnik gostitelj vrata"
+
+#: lib/rfc959.c:32
+msgid "user host NOAUTH"
+msgstr "uporabnik gostitelj NOAUTH"
+
+#: lib/rfc959.c:33
+msgid "HTTP Proxy"
+msgstr "Posredniški strežnik HTTP"
+
+#: lib/rfc959.c:34
+msgid "Custom"
+msgstr "Po meri"
+
+#: lib/rfc959.c:43
+msgid "Email address:"
+msgstr "Naslov elektronske pošte:"
+
+#: lib/rfc959.c:45
+msgid ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
+msgstr ""
+"To je geslo, ki bo uporabljeno ob prijavi v oddaljeni strežnik FTP kot "
+"brezimnež"
+
+#: lib/rfc959.c:59
+msgid "Proxy account:"
+msgstr "Račun posredniškega strežnika:"
+
+#: lib/rfc959.c:61
+msgid "Your firewall account (optional)"
+msgstr "Vaš račun požarnega zidu (izbirno)"
+
+#: lib/rfc959.c:63
+msgid "Proxy server type:"
+msgstr "Vrsta posredniškega strežnika:"
+
+#: lib/rfc959.c:66
+#, no-c-format
+msgid ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"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 ""
+"To določa kakšen način prijave pričakuje vaš posredniški strežnik. Mogoče je "
+"določiti zamenjalni niz dolžine dveh znakov s predpono %, ki bo bil zamenjan "
+"s primernimi podatki. Prva črka je lahko ali p za posrednika ali h za "
+"gostitelja strežnika FTP. Drug znak je lahko u (uporabnik), p (geslo), h "
+"(gostitelj), o (vrata) ali a (račun). Tako na primer za določitev uporabnika "
+"posrednika vnesite %pu."
+
+#: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr "Prezri naslov PASV"
+
+#: 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 ""
+"Izbrana možnost omogoča, da se PASV naslov IP oddaljenega FTP strežnika "
+"prezre. Namesto tega pa bo uporabljen IP naslov gostitelja. Nastavitev se "
+"pogosto uporablja pri usmernikih, ki v odgovoru PASV podajo svoj notranji "
+"namesto zunanjega naslova IP. "
+
+#: lib/rfc959.c:74
+msgid "Passive file transfers"
+msgstr "Pasivni prenosi datotek"
+
+#: 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. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
+msgstr ""
+"Izbrana možnost omogoča, da oddaljeni strežnik FTP odpre vrata za podatkovno "
+"povezavo. V primeru, da ste za požarnim zidom, mora biti ta možnost "
+"omogočena. Priporočeno je, da je možnost omogočena, razen v primerih "
+"povezave s starejšim FTP strežnikom, ki te podpore nima. V primeru da je "
+"možnost onemogočena bo gFTP odprl vrata na strani odjemalca, oddaljeni "
+"strežnik pa se bo z njim povezal."
+
+#: lib/rfc959.c:79
+msgid "Resolve Remote Symlinks (LIST -L)"
+msgstr "Razreševanje oddaljenih simbolnih povezav (LIST -L)"
+
+#: 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 "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
+msgstr ""
+"Oddaljeni strežnik FTP bo poskusil razrešiti simbolne povezave v seznamu "
+"map. V splošnem je dobro to omogočiti. To možnost je dobro onemogočiti le, "
+"če oddaljeni FTP strežnik ne podpira možnosti -L v LIST"
+
+#: lib/rfc959.c:84
+msgid "Transfer files in ASCII mode"
+msgstr "Prenos datotek v načinu ASCII"
+
+#: lib/rfc959.c:87
+#, fuzzy
+msgid ""
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
+"then you should enable this. Each system represents newlines differently for "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
+msgstr ""
+"Za prenašanje besedilnih datotek z Windows na UNIX sistem ali obratno, mora "
+"biti ta možnost omogočena. Sistema uporabljata različen sistem zapisovanja "
+"novih vrstic v besedilnih datotekah. Pri prenosu iz UNIX na UNIX sistem ta "
+"možnost ni zahtevana. V primeru prenosa binarnih podatkov mora biti ta "
+"možnost onemogočena."
+
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
+#, c-format
+msgid "Invalid response '%c' received from server.\n"
+msgstr "Neveljaven odziv '%c' je bil prejet s strežnika.\n"
+
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Ustvarjanje vtiča IPv4 je spodletelo: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
+#, c-format
+msgid "Cannot find an IP address in PASV response '%s'\n"
+msgstr "Ni mogoče najti naslova IP v PASV odzivu '%s'\n"
+
+#: lib/rfc959.c:775
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Preziranje IP naslovov v odzivu PASV, povezovanje z %d.%d.%d.%d:%d\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
+#, c-format
+msgid "Cannot create a data connection: %s\n"
+msgstr "Ni mogoče ustvariti podatkovne povezave: %s\n"
+
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
+#, c-format
+msgid "Cannot get socket name: %s\n"
+msgstr "Ni mogoče dobiti imena vtiča: %s\n"
+
+#: lib/rfc959.c:809 lib/rfc959.c:960
+#, c-format
+msgid "Cannot bind a port: %s\n"
+msgstr "Ni mogoče vezati vrat: %s\n"
+
+#: lib/rfc959.c:828 lib/rfc959.c:979
+#, c-format
+msgid "Cannot listen on port %d: %s\n"
+msgstr "Ni mogoče poslušati na vratih %d: %s\n"
+
+#: lib/rfc959.c:876
+#, c-format
+msgid "Failed to create a IPv6 socket: %s\n"
+msgstr "Ustvarjanje vtiča IPv6 je spodletelo: %s\n"
+
+#: lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"Napaka: Videti je, da povezava ni vzpostavljena preko IPv6. Prekinjanje "
+"povezave.\n"
+
+#: lib/rfc959.c:923 lib/rfc959.c:932
+#, c-format
+msgid "Invalid EPSV response '%s'\n"
+msgstr "Neveljaven EPSV odziv '%s'\n"
+
+#: lib/rfc959.c:989
+#, c-format
+msgid "Cannot get address of local socket: %s\n"
+msgstr "Ni mogoče dobiti naslova krajevnega vtiča: %s\n"
+
+#: lib/rfc959.c:1076
+#, c-format
+msgid "Cannot accept connection from server: %s\n"
+msgstr "Ni mogoče sprejeti povezave s strežnika: %s\n"
+
+#: lib/rfc959.c:1584
+msgid "total"
+msgstr "skupno"
+
+#: lib/rfc959.c:1586
+#, c-format
+msgid "Warning: Cannot parse listing %s\n"
+msgstr "Opozorilo: Ni mogoče razčleniti seznama %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Iskanje %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 "Ni mogoče najti imena gostitelja %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Ni mogoče ustvariti vtiča: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Poskušanje %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 "Ni se mogoče povezati z %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Povezava z %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 "Ni mogoče najdi imena storitve %s/tcp. Preverite datoteko storitev\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Povezava z %s je zakasnela\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Ni mogoče dobiti zastavic vtiča: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Ni mogoče nastaviti vtiča kot ne-blokiranega: %s\n"
+
+#: lib/sshv2.c:28
+msgid "SSH"
+msgstr "SSH"
+
+#: lib/sshv2.c:31
+msgid "SSH Prog Name:"
+msgstr "Ime programa SSH:"
+
+#: lib/sshv2.c:33
+msgid "The path to the SSH executable"
+msgstr "Pot do izvedljive datoteke SSH"
+
+#: lib/sshv2.c:34
+msgid "SSH Extra Params:"
+msgstr "Dodatni parametri SSH:"
+
+#: lib/sshv2.c:36
+msgid "Extra parameters to pass to the SSH program"
+msgstr "Dodatni parametri za program SSH"
+
+#: lib/sshv2.c:38
+msgid "Need SSH User/Pass"
+msgstr "Zahteva uporabniško ime/geslo SSH"
+
+#: lib/sshv2.c:41
+msgid "Require a username/password for SSH connections"
+msgstr "Zahtevaj uporabniško ime/geslo za povezave SSH"
+
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "Poganjanje programa %s\n"
+
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr "Vnesite šifrirno frazo za ključ RSA"
+
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
+msgstr "Vnesite šifrirno frazo za ključ '"
+
+#: lib/sshv2.c:380
+msgid "Password"
+msgstr "Geslo"
+
+#: lib/sshv2.c:381
+msgid "password"
+msgstr "geslo"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr "(da/ne)?"
+
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
+msgstr "Vnesite prehodno geslo:"
+
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Vnos gesla"
+
+#: lib/sshv2.c:519
+msgid "Enter SecurID Password:"
+msgstr "Vnesite geslo SecurID:"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "Napaka: Vneseno je bilo nepravilno geslo\n"
+
+#: lib/sshv2.c:596
+#, c-format
+msgid "%d: Protocol Initialization\n"
+msgstr "%d: Začenjanje protokola\n"
+
+#: lib/sshv2.c:600
+#, c-format
+msgid "%d: Protocol version %d\n"
+msgstr "%d: Različica protokola %d\n"
+
+#: lib/sshv2.c:609
+#, c-format
+msgid "%d: Open %s\n"
+msgstr "%d: Odpri %s\n"
+
+#: lib/sshv2.c:614
+#, c-format
+msgid "%d: Close\n"
+msgstr "%d: Zapri\n"
+
+#: lib/sshv2.c:618
+#, c-format
+msgid "%d: Open Directory %s\n"
+msgstr "%d: Odpri mapo %s\n"
+
+#: lib/sshv2.c:623
+#, c-format
+msgid "%d: Read Directory\n"
+msgstr "%d: Beri mapo\n"
+
+#: lib/sshv2.c:627
+#, c-format
+msgid "%d: Remove file %s\n"
+msgstr "%d: Odstrani datoteko %s\n"
+
+#: lib/sshv2.c:632
+#, c-format
+msgid "%d: Make directory %s\n"
+msgstr "%d: Ustvari mapo %s\n"
+
+#: lib/sshv2.c:637
+#, c-format
+msgid "%d: Remove directory %s\n"
+msgstr "%d: Odstrani mapo %s\n"
+
+#: lib/sshv2.c:642
+#, c-format
+msgid "%d: Realpath %s\n"
+msgstr "%d: Realpath %s\n"
+
+#: lib/sshv2.c:647
+#, c-format
+msgid "%d: File attributes\n"
+msgstr "%d: Atributi datotek\n"
+
+#: lib/sshv2.c:651
+#, c-format
+msgid "%d: Stat %s\n"
+msgstr "%d Stanje %s\n"
+
+#: lib/sshv2.c:671
+#, c-format
+msgid "%d: Chmod %s %o\n"
+msgstr "%d: Chmod %s %o\n"
+
+#: lib/sshv2.c:676
+#, c-format
+msgid "%d: Utime %s %d\n"
+msgstr "%d: Utime %s %d\n"
+
+#: lib/sshv2.c:690
+msgid "OK"
+msgstr "V redu"
+
+#: lib/sshv2.c:693
+msgid "EOF"
+msgstr "EOF"
+
+#: lib/sshv2.c:696
+msgid "No such file or directory"
+msgstr "Ni take datoteke ali mape"
+
+#: lib/sshv2.c:699
+msgid "Permission denied"
+msgstr "Ni ustreznih dovoljenj"
+
+#: lib/sshv2.c:702
+msgid "Failure"
+msgstr "Napaka"
+
+#: lib/sshv2.c:705
+msgid "Bad message"
+msgstr "Slabo sporočilo"
+
+#: lib/sshv2.c:708
+msgid "No connection"
+msgstr "Ni povezave"
+
+#: lib/sshv2.c:711
+msgid "Connection lost"
+msgstr "Povezava je bila izgubljena"
+
+#: lib/sshv2.c:714
+msgid "Operation unsupported"
+msgstr "Opravilo ni podprto"
+
+#: lib/sshv2.c:717
+msgid "Unknown message returned from server"
+msgstr "Prejeto je bilo neznano sporočilo s strežnika"
+
+#: lib/sshv2.c:752
+#, c-format
+msgid "Error: Message size %d too big\n"
+msgstr "Napaka: Velikost sporočila %d je prevelika\n"
+
+#: 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 "Napaka: Velikost sporočila %d s strežnika je prevelika\n"
+
+#: lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
+msgstr ""
+"Prišlo je do napake pri začenjanju povezave SSL z oddaljenim strežnikom. "
+"Sporočilo o napaki z oddaljenega strežnika je:\n"
+
+#: lib/sshv2.c:1160
+#, c-format
+msgid "Opening SSH connection to %s\n"
+msgstr "Odpiranje povezave SSH na %s\n"
+
+#: lib/sshv2.c:1212
+#, c-format
+msgid "Successfully logged into SSH server %s\n"
+msgstr "Uspešna prijava v SSH strežnik %s\n"
+
+#: lib/sslcommon.c:31
+msgid "SSL Engine"
+msgstr "SSL pogon"
+
+#: lib/sslcommon.c:34
+msgid "SSL Entropy File:"
+msgstr "Datoteka entropije SSL:"
+
+#: lib/sslcommon.c:36
+msgid "SSL entropy file"
+msgstr "Datoteka entropije SSL "
+
+#: lib/sslcommon.c:37
+msgid "Entropy Seed Length:"
+msgstr "Dolžina semena entropije:"
+
+#: lib/sslcommon.c:39
+msgid "The maximum number of bytes to seed the SSL engine with"
+msgstr "Največje število bajtov za sejanje pogona SSL"
+
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr "Potrdi vrstnika SSL"
+
+#: lib/sslcommon.c:107
+#, c-format
+msgid ""
+"Error with certificate at depth: %i\n"
+"Issuer = %s\n"
+"Subject = %s\n"
+"Error %i:%s\n"
+msgstr ""
+"Napaka potrdila na globini: %i\n"
+"Izdajatelj = %s\n"
+"Predmet = %s\n"
+"Napaka %i:%s\n"
+
+#: lib/sslcommon.c:129
+msgid "Cannot get peer certificate\n"
+msgstr "Ni mogoče dobiti potrdila vrstnika\n"
+
+#: lib/sslcommon.c:196
+#, c-format
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
+msgstr ""
+"Napaka: Gostitelj določen v potrdilu SSL (%s) se ne sklada s povezanim "
+"gostiteljem (%s). Prekinjanje povezave.\n"
+
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
+msgstr "Ni mogoče začeti knjižnice OpenSSL\n"
+
+#: lib/sslcommon.c:312
+msgid "Error loading default SSL certificates\n"
+msgstr "Napaka med nalaganjem privzetih potrdil SSL\n"
+
+#: lib/sslcommon.c:324
+msgid "Error setting cipher list (no valid ciphers)\n"
+msgstr "Napaka med nastavljanjem seznama šifer (ni veljavnih šifer)\n"
+
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
+msgid "Error: SSL engine was not initialized\n"
+msgstr "Napaka: pogon SSL ni bil začet\n"
+
+#: lib/sslcommon.c:361
+msgid "Error setting up SSL connection (BIO object)\n"
+msgstr "Napaka med nastavljanjem povezave SSL (predmet BIO)\n"
+
+#: lib/sslcommon.c:371
+msgid "Error setting up SSL connection (SSL object)\n"
+msgstr "Napaka med nastavljanjem povezave SSL (predmet SSL)\n"
+
+#: lib/sslcommon.c:392
+#, c-format
+msgid "Error with peer certificate: %s\n"
+msgstr "Napaka s potrdilom vrstnika: %s\n"
+
+#: src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr "Opravilo je bilo preklicano\n"
+
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Čakanje %d sekund pred poskusom ponovne povezave\n"
+
+#: 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 je distribuiran BREZ KAKRŠNIHKOLI zagotovil; podrobnosti so v datoteki "
+"COPYING. To je prosto programje; lahko ga redistribuirate in/ali spreminjate "
+"pod določenimi pogoji. Za podrobnosti si oglejte COPYING datoteko\n"
+
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
+msgid "Translated by"
+msgstr "Andrej Žnidaršič <andrej znidarsic gmail com>"
+
+#: 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 "Napaka: Ni povezave z oddaljeno stranjo\n"
+
+#: src/uicommon/gftpui.c:216
+msgid "usage: chmod <mode> <file>\n"
+msgstr "uporaba: chmod <način> <datoteka>\n"
+
+#: src/uicommon/gftpui.c:257
+msgid "usage: rename <old name> <new name>\n"
+msgstr "uporaba: rename <staro ime> <novo ime>\n"
+
+#: src/uicommon/gftpui.c:293
+msgid "usage: delete <file>\n"
+msgstr "uporaba: delete <datoteka>\n"
+
+#: src/uicommon/gftpui.c:328
+msgid "usage: rmdir <directory>\n"
+msgstr "uporaba: rmdir <ime mape>\n"
+
+#: src/uicommon/gftpui.c:363
+msgid "usage: site <site command>\n"
+msgstr "uporaba: site <ukaz spletne stani>\n"
+
+#: src/uicommon/gftpui.c:399
+msgid "usage: mkdir <new directory>\n"
+msgstr "uporaba mkdir <nova mapa>\n"
+
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
+msgid "usage: chdir <directory>\n"
+msgstr "uporaba: chdir <mapa>\n"
+
+#: src/uicommon/gftpui.c:526
+msgid "Invalid argument\n"
+msgstr "Neveljaven argument\n"
+
+#: src/uicommon/gftpui.c:539
+msgid "Clear the directory cache\n"
+msgstr "Počisti predpomnilnik map\n"
+
+#: src/uicommon/gftpui.c:628
+msgid "usage: open "
+msgstr "uporaba: open "
+
+#: src/uicommon/gftpui.c:704
+msgid "usage: set [variable = value]\n"
+msgstr "uporaba: set [spremenljivka = vrednost]\n"
+
+#: src/uicommon/gftpui.c:718
+#, c-format
+msgid "Error: Variable %s is not a valid configuration variable.\n"
+msgstr "Napaka: Spremenljivka %s ni veljavna nastavitvena spremenljivka.\n"
+
+#: src/uicommon/gftpui.c:725
+#, c-format
+msgid "Error: Variable %s is not available in the text port of gFTP\n"
+msgstr "Napaka: Spremenljivka %s ni na voljo v besedni različici gFTP\n"
+
+#: src/uicommon/gftpui.c:807
+msgid ""
+"Supported commands:\n"
+"\n"
+msgstr ""
+"Podprti ukazi:\n"
+"\n"
+
+#: src/uicommon/gftpui.c:852
+#, c-format
+msgid "usage: %s <filespec>\n"
+msgstr "uporaba: %s <filespec>\n"
+
+#: src/uicommon/gftpui.c:937
+msgid "about"
+msgstr "about"
+
+#: src/uicommon/gftpui.c:938
+msgid "Shows gFTP information"
+msgstr "Pokaže podrobnosti programa gFTP"
+
+#: src/uicommon/gftpui.c:939
+msgid "ascii"
+msgstr "ascii"
+
+#: src/uicommon/gftpui.c:940
+msgid "Sets the current file transfer mode to Ascii (only for FTP)"
+msgstr "Spremeni trenutni način prenosa v Ascii (le za FTP)"
+
+#: src/uicommon/gftpui.c:941
+msgid "binary"
+msgstr "binary"
+
+#: src/uicommon/gftpui.c:942
+msgid "Sets the current file transfer mode to Binary (only for FTP)"
+msgstr "Nastavi trenutni način prenosa v binarnega (le za FTP)"
+
+#: src/uicommon/gftpui.c:943
+msgid "cd"
+msgstr "cd"
+
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
+msgid "Changes the remote working directory"
+msgstr "Spremeni oddaljeno delovno mapo"
+
+#: src/uicommon/gftpui.c:945
+msgid "chdir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:947
+msgid "chmod"
+msgstr "chmod"
+
+#: src/uicommon/gftpui.c:948
+msgid "Changes the permissions of a remote file"
+msgstr "Spremeni dovoljenja oddaljene strani"
+
+#: src/uicommon/gftpui.c:949
+msgid "clear"
+msgstr "clear"
+
+#: src/uicommon/gftpui.c:950
+msgid "Available options: cache"
+msgstr "Dostopne možnosti: predpomnilnik"
+
+#: src/uicommon/gftpui.c:951
+msgid "close"
+msgstr "close"
+
+#: src/uicommon/gftpui.c:952
+msgid "Disconnects from the remote site"
+msgstr "Prekine povezavo z oddaljeno stranjo"
+
+#: src/uicommon/gftpui.c:953
+msgid "delete"
+msgstr "izbriši"
+
+#: src/uicommon/gftpui.c:954
+msgid "Removes a remote file"
+msgstr "Odstrani oddaljeno datoteko"
+
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr "dir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "Pokaže seznam map za trenutno oddaljeno mapo"
+
+#: src/uicommon/gftpui.c:957
+msgid "get"
+msgstr "get"
+
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
+msgid "Downloads remote file(s)"
+msgstr "Prejme oddaljeno/e datoteko/e"
+
+#: src/uicommon/gftpui.c:959
+msgid "help"
+msgstr "help"
+
+#: src/uicommon/gftpui.c:960
+msgid "Shows this help screen"
+msgstr "Pokaže ta zaslon pomoči"
+
+#: src/uicommon/gftpui.c:961
+msgid "lcd"
+msgstr "lcd"
+
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
+msgid "Changes the local working directory"
+msgstr "Spremeni krajevno delovno mapo"
+
+#: src/uicommon/gftpui.c:963
+msgid "lchdir"
+msgstr "lchdir"
+
+#: src/uicommon/gftpui.c:965
+msgid "lchmod"
+msgstr "lchmod"
+
+#: src/uicommon/gftpui.c:966
+msgid "Changes the permissions of a local file"
+msgstr "Spremeni dovoljenja krajevne datoteke"
+
+#: src/uicommon/gftpui.c:967
+msgid "ldelete"
+msgstr "ldelete"
+
+#: src/uicommon/gftpui.c:968
+msgid "Removes a local file"
+msgstr "Odstrani krajevno datoteko"
+
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr "ldir"
+
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+msgid "Shows the directory listing for the current local directory"
+msgstr "Pokaže seznam map za trenutno krajevno mapo"
+
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
+msgid "lmkdir"
+msgstr "lmkdir"
+
+#: src/uicommon/gftpui.c:974
+msgid "Creates a local directory"
+msgstr "Ustvari krajevno mapo"
+
+#: src/uicommon/gftpui.c:975
+msgid "lpwd"
+msgstr "lpwd"
+
+#: src/uicommon/gftpui.c:976
+msgid "Show current local directory"
+msgstr "Pokaže trenutno krajevno mapo"
+
+#: src/uicommon/gftpui.c:977
+msgid "lrename"
+msgstr "lrename"
+
+#: src/uicommon/gftpui.c:978
+msgid "Rename a local file"
+msgstr "Preimenuje krajevno datoteko"
+
+#: src/uicommon/gftpui.c:979
+msgid "lrmdir"
+msgstr "lrmdir"
+
+#: src/uicommon/gftpui.c:980
+msgid "Remove a local directory"
+msgstr "Odstrani krajevno mapo"
+
+#: src/uicommon/gftpui.c:981
+msgid "ls"
+msgstr "ls"
+
+#: src/uicommon/gftpui.c:983
+msgid "mget"
+msgstr "mget"
+
+#: src/uicommon/gftpui.c:985
+msgid "mkdir"
+msgstr "mkdir"
+
+#: src/uicommon/gftpui.c:986
+msgid "Creates a remote directory"
+msgstr "Ustvari oddaljeno mapo"
+
+#: src/uicommon/gftpui.c:987
+msgid "mput"
+msgstr "mput"
+
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
+msgid "Uploads local file(s)"
+msgstr "Pošlji krajevn(o)/(e) datotek(o)/(e)"
+
+#: src/uicommon/gftpui.c:989
+msgid "open"
+msgstr "open"
+
+#: src/uicommon/gftpui.c:990
+msgid "Opens a connection to a remote site"
+msgstr "Odpre povezavo z oddaljeno stranjo"
+
+#: src/uicommon/gftpui.c:991
+msgid "put"
+msgstr "put"
+
+#: src/uicommon/gftpui.c:993
+msgid "pwd"
+msgstr "pwd"
+
+#: src/uicommon/gftpui.c:994
+msgid "Show current remote directory"
+msgstr "Pokaže trenutno oddaljeno mapo"
+
+#: src/uicommon/gftpui.c:995
+msgid "quit"
+msgstr "končaj"
+
+#: src/uicommon/gftpui.c:996
+msgid "Exit from gFTP"
+msgstr "Izhod iz programa gFTP"
+
+#: src/uicommon/gftpui.c:997
+msgid "rename"
+msgstr "rename"
+
+#: src/uicommon/gftpui.c:998
+msgid "Rename a remote file"
+msgstr "Odstrani oddaljeno datoteko"
+
+#: src/uicommon/gftpui.c:999
+msgid "rmdir"
+msgstr "rmdir"
+
+#: src/uicommon/gftpui.c:1000
+msgid "Remove a remote directory"
+msgstr "Odstrani oddaljeno mapo"
+
+#: src/uicommon/gftpui.c:1001
+msgid "set"
+msgstr "nastavi"
+
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"Prikaži spremenljivke nastavitvenih datotek. Spremenljivke je mogoče "
+"nastaviti z var=val"
+
+#: src/uicommon/gftpui.c:1004
+msgid "site"
+msgstr "spletišče"
+
+#: src/uicommon/gftpui.c:1005
+msgid "Run a site specific command"
+msgstr "Poganjanje določenega ukaza za spletišče"
+
+#: src/uicommon/gftpui.c:1094
+msgid "Error: Command not recognized\n"
+msgstr "Napaka: Ukaz ni prepoznan\n"
+
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "%s uspešno preneseno pri %.2f kB/s\n"
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Spuščanje datoteke %s na gostitelju %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Ustavljanje prenosa na gostitelju %s\n"
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Ni mogoče prejeti %s z %s\n"
+
+#: src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+"%d datotek ali map ni bilo mogoče prenesti. Preverite dnevnik za predmete, "
+"ki niso bilo pravilno preneseni."
+
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
+#, c-format
+msgid "%s: Please hit the stop button first to do anything else\n"
+msgstr ""
+"%s: Preden je mogoče narediti kaj drugega, je treba pritisniti gumb "
+"zaustavi\n"
+
+#: src/gtk/bookmarks.c:41
+msgid "Run Bookmark"
+msgstr "Poženi zaznamek"
+
+#: src/gtk/bookmarks.c:71
+msgid "Add Bookmark: You must enter a name for the bookmark\n"
+msgstr "Dodajanje zaznamka: Vnesti morate ime zaznamka\n"
+
+#: src/gtk/bookmarks.c:78
+#, c-format
+msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
+msgstr ""
+"Dodajanje zaznamka: Zaznamka %s ni mogoče dodati, ker to ime že obstaja\n"
+
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
+msgid "Add Bookmark"
+msgstr "Dodaj zaznamek"
+
+#: src/gtk/bookmarks.c:142
+msgid "Add Bookmark: You must enter a hostname\n"
+msgstr "Dodajanje zaznamka: Vnesti morate ime gostitelja\n"
+
+#: src/gtk/bookmarks.c:146
+msgid ""
+"Enter the name of the bookmark you want to add\n"
+"You can separate items by a / to put it into a submenu\n"
+"(ex: Linux Sites/Debian)"
+msgstr ""
+"Vnesite ime zaznamka za dodajanje\n"
+"Predmete je mogoče ločiti z / in jih dodati v podmeni\n"
+"(npr.: Linux Strani/Debian)"
+
+#: src/gtk/bookmarks.c:146
+msgid "Remember password"
+msgstr "Zapomni si geslo"
+
+#: src/gtk/bookmarks.c:418
+msgid "You must specify a name for the bookmark."
+msgstr "Navesti morate ime zaznamka."
+
+#: src/gtk/bookmarks.c:463
+msgid "New Folder"
+msgstr "Nova mapa"
+
+#: src/gtk/bookmarks.c:464
+msgid "Enter the name of the new folder to create"
+msgstr "Vnesite ime nove mape"
+
+#: src/gtk/bookmarks.c:473
+msgid "New Item"
+msgstr "Nov predmet"
+
+#: src/gtk/bookmarks.c:474
+msgid "Enter the name of the new item to create"
+msgstr "Vnesite ime novega predmeta"
+
+#: src/gtk/bookmarks.c:547
+#, c-format
+msgid ""
+"Are you sure you want to erase the bookmark\n"
+"%s and all its children?"
+msgstr ""
+"Ali ste prepričani, da želite izbrisati zaznamek\n"
+"%s in vse njegove otroke ?"
+
+#: src/gtk/bookmarks.c:548
+msgid "Delete Bookmark"
+msgstr "Izbriši zaznamek"
+
+#: src/gtk/bookmarks.c:620
+msgid "Bookmarks"
+msgstr "Zaznamki"
+
+#: src/gtk/bookmarks.c:825
+msgid "Edit Entry"
+msgstr "Urejanje vnosa"
+
+#: src/gtk/bookmarks.c:860
+msgid "Description:"
+msgstr "Opis:"
+
+#: src/gtk/bookmarks.c:875
+msgid "Hostname:"
+msgstr "Ime gostitelja:"
+
+#: src/gtk/bookmarks.c:888
+msgid "Port:"
+msgstr "Vrata:"
+
+#: src/gtk/bookmarks.c:905
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: src/gtk/bookmarks.c:929
+msgid "Remote Directory:"
+msgstr "Oddaljena mapa:"
+
+#: src/gtk/bookmarks.c:942
+msgid "Local Directory:"
+msgstr "Krajevna mapa:"
+
+#: src/gtk/bookmarks.c:959
+msgid "Username:"
+msgstr "Uporabniško ime:"
+
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
+msgid "Password:"
+msgstr "Geslo:"
+
+#: src/gtk/bookmarks.c:986
+msgid "Account:"
+msgstr "Račun:"
+
+#: src/gtk/bookmarks.c:1000
+msgid "Log in as ANONYMOUS"
+msgstr "Prijava kot brezimnež"
+
+#: src/gtk/bookmarks.c:1154
+msgid "/_File"
+msgstr "/_Datoteka"
+
+#: src/gtk/bookmarks.c:1155
+msgid "/File/tearoff"
+msgstr "/Datoteka/odtrgaj"
+
+#: src/gtk/bookmarks.c:1156
+msgid "/File/New _Folder..."
+msgstr "/Datoteka/Nova _mapa ..."
+
+#: src/gtk/bookmarks.c:1157
+msgid "/File/New _Item..."
+msgstr "/Datoteka/Nov predme_t ..."
+
+#: src/gtk/bookmarks.c:1158
+msgid "/File/_Delete"
+msgstr "/Datoteka/Izbri_ši"
+
+#: src/gtk/bookmarks.c:1159
+msgid "/File/_Properties..."
+msgstr "/Datoteka/_Lastnosti ..."
+
+#: src/gtk/bookmarks.c:1160
+msgid "/File/sep"
+msgstr "/Datoteka/loči"
+
+#: src/gtk/bookmarks.c:1161
+msgid "/File/_Close"
+msgstr "/Datoteka/_Zapri"
+
+#: src/gtk/bookmarks.c:1173
+msgid "Edit Bookmarks"
+msgstr "Uredi zaznamke"
+
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
+msgid "Chmod"
+msgstr "Chmod"
+
+#: src/gtk/chmod_dialog.c:152
+msgid ""
+"You can now adjust the attributes of your file(s)\n"
+"Note: Not all ftp servers support the chmod feature"
+msgstr ""
+"Sedaj je mogoče prilagoditi atribute vaših datotek\n"
+"Opomba: Vsi strežniki ftp ne podpirajo ukaza chmod"
+
+#: src/gtk/chmod_dialog.c:162
+msgid "Special"
+msgstr "Posebno"
+
+#: src/gtk/chmod_dialog.c:170
+msgid "SUID"
+msgstr "SUID"
+
+#: src/gtk/chmod_dialog.c:174
+msgid "SGID"
+msgstr "SGID"
+
+#: src/gtk/chmod_dialog.c:178
+msgid "Sticky"
+msgstr "Lepljivo"
+
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
+msgid "User"
+msgstr "Uporabnik"
+
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
+msgid "Read"
+msgstr "Preberi"
+
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
+msgid "Write"
+msgstr "Zapiši"
+
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
+msgid "Execute"
+msgstr "Izvedi"
+
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
+msgid "Group"
+msgstr "Skupina"
+
+#: src/gtk/chmod_dialog.c:222
+msgid "Other"
+msgstr "Ostalo"
+
+#: src/gtk/delete_dialog.c:61
+#, c-format
+msgid "Are you sure you want to delete these %ld files and %ld directories"
+msgstr "Ali ste prepričani, da želite izbrisati %ld datotek in %ld map"
+
+#: src/gtk/delete_dialog.c:65
+#, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "Ali ste prepričani, da želite izbrisati %ld datotek"
+
+#: src/gtk/delete_dialog.c:69
+#, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "Ali ste prepričani, da želite izbrisati %ld map"
+
+#: src/gtk/delete_dialog.c:74
+msgid "Delete Files/Directories"
+msgstr "Izbriši datoteke/mape"
+
+#: src/gtk/delete_dialog.c:90
+msgid "Delete"
+msgstr "Izbriši"
+
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Povezava"
+
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
+#, c-format
+msgid "Received URL %s\n"
+msgstr "Prejet URL %s\n"
+
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "Povleci in spusti"
+
+#: src/gtk/gftp-gtk.c:142
+msgid "Exit"
+msgstr "Izhod"
+
+#: src/gtk/gftp-gtk.c:142
+msgid ""
+"There are file transfers in progress.\n"
+"Are you sure you want to exit?"
+msgstr ""
+"Trenutno potekajo prenosi datotek.\n"
+"Ali ste prepričani, da želite zapreti program?"
+
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+msgid "Open Location"
+msgstr "Odpri mesto"
+
+#: src/gtk/gftp-gtk.c:217
+msgid "Enter a URL to connect to"
+msgstr "Vnesite URL za povezavo"
+
+#: src/gtk/gftp-gtk.c:263
+msgid "/_FTP"
+msgstr "/_FTP"
+
+#: src/gtk/gftp-gtk.c:264
+msgid "/FTP/tearoff"
+msgstr "/FTP/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:265
+msgid "/FTP/Window _1"
+msgstr "/FTP/Okno _1"
+
+#: src/gtk/gftp-gtk.c:267
+msgid "/FTP/Window _2"
+msgstr "/FTP/Okno _2"
+
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
+msgid "/FTP/sep"
+msgstr "/FTP/loči"
+
+#: src/gtk/gftp-gtk.c:270
+msgid "/FTP/_Ascii"
+msgstr "/FTP/_Ascii"
+
+#: src/gtk/gftp-gtk.c:272
+msgid "/FTP/_Binary"
+msgstr "/FTP/_Binarno"
+
+#: src/gtk/gftp-gtk.c:275
+msgid "/FTP/_Preferences..."
+msgstr "/FTP/_Možnosti ..."
+
+#: src/gtk/gftp-gtk.c:278
+msgid "/FTP/_Quit"
+msgstr "/FTP/_Končaj"
+
+#: src/gtk/gftp-gtk.c:279
+msgid "/_Local"
+msgstr "/_Krajevno"
+
+#: src/gtk/gftp-gtk.c:280
+msgid "/Local/tearoff"
+msgstr "/Krajevno/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:281
+msgid "/Local/_Open Location..."
+msgstr "/Krajevno/_Odpri mesto ..."
+
+#: src/gtk/gftp-gtk.c:283
+msgid "/Local/D_isconnect"
+msgstr "/Krajevno/P_rekini povezavo"
+
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
+msgid "/Local/sep"
+msgstr "/Krajevno/loči"
+
+#: src/gtk/gftp-gtk.c:285
+msgid "/Local/Change _Filespec..."
+msgstr "/Krajevno/Spremeni določilo datoteke ..."
+
+#: src/gtk/gftp-gtk.c:287
+msgid "/Local/_Show selected"
+msgstr "/Krajevno/_Pokaži izbrane"
+
+#: src/gtk/gftp-gtk.c:288
+msgid "/Local/Select _All"
+msgstr "/Krajevno/Izberi vs_e"
+
+#: src/gtk/gftp-gtk.c:289
+msgid "/Local/Select All Files"
+msgstr "/Krajevno/Izberi vse datoteke"
+
+#: src/gtk/gftp-gtk.c:290
+msgid "/Local/Deselect All"
+msgstr "/Krajevno/Odstrani izbor vsega"
+
+#: src/gtk/gftp-gtk.c:292
+msgid "/Local/Save Directory Listing..."
+msgstr "/Krajevno/Shrani seznam map ..."
+
+#: src/gtk/gftp-gtk.c:293
+msgid "/Local/Send SITE Command..."
+msgstr "/Krajevno/Pošlji ukaz SITE ..."
+
+#: src/gtk/gftp-gtk.c:294
+msgid "/Local/_Change Directory"
+msgstr "/Krajevno/Spremeni ma_po"
+
+#: src/gtk/gftp-gtk.c:295
+msgid "/Local/_Permissions..."
+msgstr "/Krajevno/Dovo_ljenja ..."
+
+#: src/gtk/gftp-gtk.c:297
+msgid "/Local/_New Folder..."
+msgstr "/Krajevno/_Nova mapa ..."
+
+#: src/gtk/gftp-gtk.c:298
+msgid "/Local/Rena_me..."
+msgstr "/Krajevno/Prei_menuj ..."
+
+#: src/gtk/gftp-gtk.c:300
+msgid "/Local/_Delete..."
+msgstr "/Krajevno/Iz_briši ..."
+
+#: src/gtk/gftp-gtk.c:302
+msgid "/Local/_Edit..."
+msgstr "/Krajevno/Ur_edi ..."
+
+#: src/gtk/gftp-gtk.c:303
+msgid "/Local/_View..."
+msgstr "/Krajevno/Po_gled ..."
+
+#: src/gtk/gftp-gtk.c:304
+msgid "/Local/_Refresh"
+msgstr "/Krajevno/_Osveži"
+
+#: src/gtk/gftp-gtk.c:306
+msgid "/_Remote"
+msgstr "/_Oddaljeno"
+
+#: src/gtk/gftp-gtk.c:307
+msgid "/Remote/tearoff"
+msgstr "/Oddaljeno/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:308
+msgid "/Remote/_Open Location..."
+msgstr "/Oddaljeno/_Odpri mesto ..."
+
+#: src/gtk/gftp-gtk.c:310
+msgid "/Remote/D_isconnect"
+msgstr "/Oddaljeno/Prek_ini povezavo"
+
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
+msgid "/Remote/sep"
+msgstr "/Oddaljeno/loči"
+
+#: src/gtk/gftp-gtk.c:313
+msgid "/Remote/Change _Filespec..."
+msgstr "/Oddaljeno/Spremeni določilo datoteke ..."
+
+#: src/gtk/gftp-gtk.c:315
+msgid "/Remote/_Show selected"
+msgstr "/Oddaljeno/_Pokaži izbrano"
+
+#: src/gtk/gftp-gtk.c:316
+msgid "/Remote/Select _All"
+msgstr "/Oddaljeno/Izberi _vse"
+
+#: src/gtk/gftp-gtk.c:317
+msgid "/Remote/Select All Files"
+msgstr "/Oddaljeno/Izberi vse datoteke"
+
+#: src/gtk/gftp-gtk.c:318
+msgid "/Remote/Deselect All"
+msgstr "/Oddaljeno/Odstrani izbor vsega"
+
+#: src/gtk/gftp-gtk.c:320
+msgid "/Remote/Save Directory Listing..."
+msgstr "/Oddaljeno/Shrani seznam map ..."
+
+#: src/gtk/gftp-gtk.c:321
+msgid "/Remote/Send SITE Command..."
+msgstr "/Oddaljeno/Pošlji ukaz SITE ..."
+
+#: src/gtk/gftp-gtk.c:322
+msgid "/Remote/_Change Directory"
+msgstr "/Oddaljeno/Sp_remeni mapo"
+
+#: src/gtk/gftp-gtk.c:323
+msgid "/Remote/_Permisssions..."
+msgstr "/Oddaljeno/Do_voljenja ..."
+
+#: src/gtk/gftp-gtk.c:324
+msgid "/Remote/_New Folder..."
+msgstr "/Oddaljeno/_Nova mapa ..."
+
+#: src/gtk/gftp-gtk.c:326
+msgid "/Remote/Rena_me..."
+msgstr "/Oddaljeno/Prei_menuj ..."
+
+#: src/gtk/gftp-gtk.c:328
+msgid "/Remote/_Delete..."
+msgstr "/Oddaljeno/Iz_briši ..."
+
+#: src/gtk/gftp-gtk.c:329
+msgid "/Remote/_Edit..."
+msgstr "/Odaljeno/Ur_edi ..."
+
+#: src/gtk/gftp-gtk.c:330
+msgid "/Remote/_View..."
+msgstr "/Oddaljeno/_Pogled ..."
+
+#: src/gtk/gftp-gtk.c:331
+msgid "/Remote/_Refresh"
+msgstr "/Oddaljeno/Osve_ži"
+
+#: src/gtk/gftp-gtk.c:333
+msgid "/_Bookmarks"
+msgstr "/_Zaznamki"
+
+#: src/gtk/gftp-gtk.c:334
+msgid "/Bookmarks/tearoff"
+msgstr "/Zaznamki/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:335
+msgid "/Bookmarks/Add _Bookmark"
+msgstr "/Zaznamki/Dodaj zaz_namek"
+
+#: src/gtk/gftp-gtk.c:337
+msgid "/Bookmarks/Edit Bookmarks"
+msgstr "/Zaznamki/Uredi zaznamke"
+
+#: src/gtk/gftp-gtk.c:338
+msgid "/Bookmarks/sep"
+msgstr "/Zaznamki/loči"
+
+#: src/gtk/gftp-gtk.c:339
+msgid "/_Transfer"
+msgstr "/_Prenos"
+
+#: src/gtk/gftp-gtk.c:340
+msgid "/Transfer/tearoff"
+msgstr "/Prenos/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:341
+msgid "/Transfer/_Start"
+msgstr "/Prenos/_Začni"
+
+#: src/gtk/gftp-gtk.c:342
+msgid "/Transfer/St_op"
+msgstr "/Prenos/Zaust_avi"
+
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+msgid "/Transfer/sep"
+msgstr "/Prenos/loči"
+
+#: src/gtk/gftp-gtk.c:345
+msgid "/Transfer/Skip _Current File"
+msgstr "/Prenos/_Preskoči trenutno datoteko"
+
+#: src/gtk/gftp-gtk.c:346
+msgid "/Transfer/_Remove File"
+msgstr "/Prenos/Odst_rani datoteko"
+
+#: src/gtk/gftp-gtk.c:348
+msgid "/Transfer/Move File _Up"
+msgstr "/Prenos/Premakni datoteko navz_gor"
+
+#: src/gtk/gftp-gtk.c:350
+msgid "/Transfer/Move File _Down"
+msgstr "/Prenos/Premakni datoteko navz_dol"
+
+#: src/gtk/gftp-gtk.c:353
+msgid "/Transfer/_Retrieve Files"
+msgstr "/Prenos/P_ridobi datoteke"
+
+#: src/gtk/gftp-gtk.c:354
+msgid "/Transfer/_Put Files"
+msgstr "/Prenos/Nalo_ži datoteke"
+
+#: src/gtk/gftp-gtk.c:355
+msgid "/L_og"
+msgstr "/D_nevnik"
+
+#: src/gtk/gftp-gtk.c:356
+msgid "/Log/tearoff"
+msgstr "/Dnevnik/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:357
+msgid "/Log/_Clear"
+msgstr "/Dnevnik/Po_čisti"
+
+#: src/gtk/gftp-gtk.c:358
+msgid "/Log/_View"
+msgstr "/Dnevnik/Po_glej"
+
+#: src/gtk/gftp-gtk.c:359
+msgid "/Log/_Save..."
+msgstr "/Dnevnik/_Shrani ..."
+
+#: src/gtk/gftp-gtk.c:360
+msgid "/Tool_s"
+msgstr "/Orod_ja"
+
+#: src/gtk/gftp-gtk.c:361
+msgid "/Tools/tearoff"
+msgstr "/Orodja/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:362
+msgid "/Tools/C_ompare Windows"
+msgstr "/Orodja/Primerjaj o_kna"
+
+#: src/gtk/gftp-gtk.c:363
+msgid "/Tools/_Clear Cache"
+msgstr "/Orodja/Počisti pomni_lnik"
+
+#: src/gtk/gftp-gtk.c:364
+msgid "/Help"
+msgstr "/Pomoč"
+
+#: src/gtk/gftp-gtk.c:365
+msgid "/Help/tearoff"
+msgstr "/Pomoč/odtrgaj"
+
+#: src/gtk/gftp-gtk.c:366
+msgid "/Help/_About"
+msgstr "/Pomoč/O progr_amu"
+
+#: src/gtk/gftp-gtk.c:485
+msgid "_Host: "
+msgstr "Gos_titelj:"
+
+#: src/gtk/gftp-gtk.c:508
+msgid "Port: "
+msgstr "Vrata: "
+
+#: src/gtk/gftp-gtk.c:528
+msgid "_User: "
+msgstr "_Uporabnik:"
+
+#: src/gtk/gftp-gtk.c:550
+msgid "Pass: "
+msgstr "Geslo:"
+
+#: src/gtk/gftp-gtk.c:618
+msgid "Command: "
+msgstr "Ukaz:"
+
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
+msgid "Filename"
+msgstr "Ime datoteke"
+
+#: src/gtk/gftp-gtk.c:770
+msgid "Size"
+msgstr "Velikost"
+
+#: src/gtk/gftp-gtk.c:773
+msgid "Date"
+msgstr "Datum"
+
+#: src/gtk/gftp-gtk.c:774
+msgid "Attribs"
+msgstr "Atributi"
+
+#: src/gtk/gftp-gtk.c:969
+msgid "Progress"
+msgstr "Napredek"
+
+#: src/gtk/gftp-gtk.c:1086
+msgid "Error: You must type in a host to connect to\n"
+msgstr "Napaka: Treba je vnesti vrsto gostitelja za povezavo\n"
+
+#: src/gtk/gtkui.c:53
+msgid "Refresh"
+msgstr "Osveži"
+
+#: src/gtk/gtkui.c:120
+msgid "Enter Username"
+msgstr "Vnos uporabniškega imena"
+
+#: src/gtk/gtkui.c:121
+msgid "Please enter your username for this site"
+msgstr "Vnesite svoje uporabniško ime za to spletišče"
+
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
+msgid "Please enter your password for this site"
+msgstr "Vnesite svoje geslo za to spletišče"
+
+#: src/gtk/gtkui.c:286
+msgid "Operation canceled...you must enter a string\n"
+msgstr "Dejanje je preklicano ... vnesti morate niz\n"
+
+#: src/gtk/gtkui.c:332
+msgid "Mkdir"
+msgstr "Mkdir"
+
+#: src/gtk/gtkui.c:335
+msgid "Make Directory"
+msgstr "Ustvari mapo"
+
+#: src/gtk/gtkui.c:335
+msgid "Enter name of directory to create"
+msgstr "Vnesite ime mape za ustvarjanje"
+
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: src/gtk/gtkui.c:368
+#, c-format
+msgid "What would you like to rename %s to?"
+msgstr "Kakšno naj bo novo ime %s?"
+
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
+msgid "Site"
+msgstr "Spletišče"
+
+#: src/gtk/gtkui.c:393
+msgid "Enter site-specific command"
+msgstr "Vnesite ukaz specifične za stran"
+
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr "Predpona s stranjo"
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
+msgid "Chdir"
+msgstr "Chdir"
+
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
+msgid "Skipped"
+msgstr "Preskočeno"
+
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
+msgid "Waiting..."
+msgstr "Čakanje ..."
+
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
+msgid "Resume"
+msgstr "Nadaljuj"
+
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
+msgid "Skip"
+msgstr "Preskoči"
+
+#: src/gtk/gtkui_transfer.c:229
+msgid "Action"
+msgstr "Dejanje"
+
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
+msgid "Transfer Files"
+msgstr "Prenos datotek"
+
+#: src/gtk/gtkui_transfer.c:242
+msgid ""
+"The following file(s) exist on both the local and remote computer\n"
+"Please select what you would like to do"
+msgstr ""
+"Naslednje datoteke obstajajo na krajevnem in oddaljenem računalniku\n"
+"Izberite ustrezno dejanje"
+
+#: src/gtk/gtkui_transfer.c:303
+msgid "Error"
+msgstr "Napaka"
+
+#: src/gtk/gtkui_transfer.c:333
+msgid "Skip File"
+msgstr "Preskoči datoteko"
+
+#: src/gtk/gtkui_transfer.c:343
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: src/gtk/gtkui_transfer.c:349
+msgid "Deselect All"
+msgstr "Odstrani izbor vsega"
+
+#: src/gtk/menu-items.c:65
+msgid "Change Filespec: Operation canceled...you must enter a string\n"
+msgstr "Sprememba določil: Dejanje je prekinjeno ... vnesti morate niz\n"
+
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
+msgid "Change Filespec"
+msgstr "Sprememba določil datoteke"
+
+#: src/gtk/menu-items.c:86
+msgid "Enter the new file specification"
+msgstr "Vnesite novo določilo datoteke"
+
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, c-format
+msgid "Error: Cannot open %s for writing: %s\n"
+msgstr "Napaka: Ni mogoče odpreti %s za pisanje: %s\n"
+
+#: src/gtk/menu-items.c:143
+msgid "Save Directory Listing"
+msgstr "Shranjevanje seznama map"
+
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
+#, c-format
+msgid "Error: Error writing to %s: %s\n"
+msgstr "Napaka: Napaka med pisanjem v %s: %s\n"
+
+#: src/gtk/menu-items.c:382
+#, c-format
+msgid "Successfully wrote the log file to %s\n"
+msgstr "Dnevniška datoteka je bila uspešno zapisana v %s\n"
+
+#: src/gtk/menu-items.c:394
+msgid "Save Log"
+msgstr "Shrani dnevnik"
+
+#: src/gtk/menu-items.c:428
+#, c-format
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
+msgstr ""
+"Ni mogoče najti datoteke o licenčnem dogovoru COPYING. Treba se je "
+"prepričati, da je v %s ali %s"
+
+#: src/gtk/menu-items.c:430
+msgid "About gFTP"
+msgstr "O gFTP"
+
+#: src/gtk/menu-items.c:460
+#, c-format
+msgid ""
+"%s\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
+"Official Homepage: http://www.gftp.org/\n";
+msgstr ""
+"%s\n"
+"Avtorske pravice (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
+"Uradna domača stran: http://www.gftp.org/\n";
+
+#: src/gtk/menu-items.c:473
+msgid "About"
+msgstr "O programu"
+
+#: src/gtk/menu-items.c:506
+msgid "License Agreement"
+msgstr "Licenčni dogovor"
+
+#: src/gtk/menu-items.c:613
+msgid "Compare Windows"
+msgstr "Primerjaj okna"
+
+#: src/gtk/misc-gtk.c:209
+msgid "Disconnect from the remote server"
+msgstr "Prekini povezavo z oddaljenim strežnikom"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+"Povezava do strani navedene v vnosu gostiteljev. Če je vnos gostitelja "
+"prazen, se prikaže pogovorno okno, ki omogoča vnos URL-ja."
+
+#: src/gtk/misc-gtk.c:260
+msgid "All Files"
+msgstr "Vse datoteke"
+
+#: src/gtk/misc-gtk.c:270
+msgid "] (Cached) ["
+msgstr "] (V pomnilniku) ["
+
+#: src/gtk/misc-gtk.c:281
+msgid "Not connected"
+msgstr "Ni povezave"
+
+#: src/gtk/misc-gtk.c:383
+#, c-format
+msgid "Error opening file %s: %s\n"
+msgstr "Napaka med odpiranjem datoteke %s: %s\n"
+
+#: src/gtk/misc-gtk.c:468
+#, c-format
+msgid "%s: Not connected to a remote site\n"
+msgstr "%s: Ni povezave z oddaljenim spletiščem\n"
+
+#: src/gtk/misc-gtk.c:475
+#, c-format
+msgid "%s: This feature is not available using this protocol\n"
+msgstr "%s: Ta zmožnost pri uporabi tega protokola ni na voljo\n"
+
+#: src/gtk/misc-gtk.c:483
+#, c-format
+msgid "%s: You must only have one item selected\n"
+msgstr "%s: Izbran mora natanko en predmet\n"
+
+#: src/gtk/misc-gtk.c:490
+#, c-format
+msgid "%s: You must have at least one item selected\n"
+msgstr "%s: Izbran mora biti vsaj en predmet\n"
+
+#: src/gtk/misc-gtk.c:814
+msgid "Change"
+msgstr "Spremeni"
+
+#: src/gtk/misc-gtk.c:973
+msgid "Getting directory listings"
+msgstr "Pridobivanje seznama map"
+
+#: src/gtk/misc-gtk.c:993
+msgid "  Stop  "
+msgstr "  Zaustavi "
+
+#: src/gtk/misc-gtk.c:1003
+#, c-format
+msgid ""
+"Received %ld directories\n"
+"and %ld files"
+msgstr ""
+"Prejetih je bilo %ld map\n"
+"in %ld datotek"
+
+#: src/gtk/misc-gtk.c:1079
+#, c-format
+msgid "gFTP Error: Cannot find file %s in %s or %s\n"
+msgstr "Napaka gFTP: Ni mogoče najti datoteke %s v %s ali %s\n"
+
+#: src/gtk/options_dialog.c:907
+msgid "Edit Host"
+msgstr "Urejanje gostitelja"
+
+#: src/gtk/options_dialog.c:907
+msgid "Add Host"
+msgstr "Dodajanje gostitelja"
+
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr "Vrs_ta:"
+
+#: src/gtk/options_dialog.c:948
+msgid "Domain"
+msgstr "Domena"
+
+#: src/gtk/options_dialog.c:978
+msgid "_Network address:"
+msgstr "Omrež_ni naslov:"
+
+#: src/gtk/options_dialog.c:1013
+msgid "N_etmask:"
+msgstr "Omrežna _maska:"
+
+#: src/gtk/options_dialog.c:1056
+msgid "_Domain:"
+msgstr "_Domena:"
+
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Omrežna maska"
+
+#: src/gtk/options_dialog.c:1139
+msgid "Local Hosts"
+msgstr "Krajevni gostitelji"
+
+#: src/gtk/options_dialog.c:1240
+msgid "Options"
+msgstr "Možnosti"
+
+#: src/gtk/transfer.c:30
+msgid "Receiving file names..."
+msgstr "Prejemanje imen datotek ..."
+
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
+msgid "Connecting..."
+msgstr "Povezovanje ..."
+
+#: src/gtk/transfer.c:99
+msgid "Retrieve Files: Not connected to a remote site\n"
+msgstr "Pridobivanje datotek: Ni povezave z oddaljeno stranjo\n"
+
+#: src/gtk/transfer.c:336
+#, c-format
+msgid "Error: Child %d returned %d\n"
+msgstr "Napaka: Podrejeno opravilo %d je vrnilo napako %d\n"
+
+#: src/gtk/transfer.c:345
+#, c-format
+msgid "Child %d returned successfully\n"
+msgstr "Podrejeno opravilo %d se je uspešno vrnilo\n"
+
+#: src/gtk/transfer.c:352
+#, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Napaka: Podrejeno opravilo %d se ni primerno končalo\n"
+
+#: src/gtk/transfer.c:368
+#, c-format
+msgid "Error: Cannot get information about file %s: %s\n"
+msgstr "Napaka: Ni mogoče dobiti podatkov o datoteki %s: %s\n"
+
+#: src/gtk/transfer.c:374
+#, c-format
+msgid "File %s was not changed\n"
+msgstr "Datoteka %s ni bila spremenjena\n"
+
+#: src/gtk/transfer.c:382
+#, c-format
+msgid ""
+"File %s has changed.\n"
+"Would you like to upload it?"
+msgstr ""
+"Datoteka %s je bila spremenjena.\n"
+"Ali jo želite poslati ?"
+
+#: src/gtk/transfer.c:385
+msgid "Edit File"
+msgstr "Urejanje datoteke"
+
+#: src/gtk/transfer.c:476
+msgid "Finished"
+msgstr "Končano"
+
+#: src/gtk/transfer.c:734
+#, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Poslano %s od %s pri %.2fkB/s, %02d:%02d:%02d ocenjen preostali čas"
+
+#: src/gtk/transfer.c:739
+#, c-format
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Prejeto %s od %s pri %.2fkB/s, %02d:%02d:%02d ocenjen preostali čas"
+
+#: src/gtk/transfer.c:750
+#, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Poslano %s od %s, prenos je zastal, neznan preostali čas"
+
+#: src/gtk/transfer.c:756
+#, c-format
+msgid "Recv %s of %s, transfer stalled, unknown time remaining"
+msgstr "Prejeto %s od %s, prenos je zastal, neznan preostali čas"
+
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr "Neznan odstotek je končan. (Datoteka %ld od %ld)"
+
+#: src/gtk/transfer.c:804
+#, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr ""
+"%d%% končano, %02d:%02d:%02d ocenjen preostali čas. (Datoteka %ld od %ld)"
+
+#: src/gtk/transfer.c:842
+#, c-format
+msgid "Retrieving file names...%s bytes"
+msgstr "Pridobivanje imen datotek ... %s bajtov"
+
+#: 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 "Izbran ni noben prenos podatkov\n"
+
+#: src/gtk/view_dialog.c:34
+msgid "View"
+msgstr "Pogled"
+
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Uredi"
+
+#: src/gtk/view_dialog.c:49
+#, c-format
+msgid "View: %s is a directory. Cannot view it.\n"
+msgstr "Pogled: %s je mapa. Ni je mogoče ogledati.\n"
+
+#: src/gtk/view_dialog.c:52
+#, c-format
+msgid "Edit: %s is a directory. Cannot edit it.\n"
+msgstr "Urejanje: %s je mapa. Ni je mogoče urejati.\n"
+
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "Urejanje: V pogovornem oknu nastavitev je treba navesti urejevalnik\n"
+
+#: src/gtk/view_dialog.c:177
+#, c-format
+msgid "View: Cannot fork another process: %s\n"
+msgstr "Pogled: Ni mogoče vejiti drugega opravila: %s\n"
+
+#: src/gtk/view_dialog.c:180
+#, c-format
+msgid "Running program: %s %s\n"
+msgstr "Poganjanje programa: %s %s\n"
+
+#: src/gtk/view_dialog.c:238
+#, c-format
+msgid "Opening %s with %s\n"
+msgstr "Odpiranje %s z %s\n"
+
+#: src/gtk/view_dialog.c:280
+#, c-format
+msgid "Viewing file %s\n"
+msgstr "Ogledovanje datoteke %s\n"
+
+#: src/gtk/view_dialog.c:287
+#, c-format
+msgid "View: Cannot open file %s: %s\n"
+msgstr "Pogled: Ni mogoče odpreti datoteke %s: %s\n"
+
+#: src/text/gftp-text.c:166
+#, c-format
+msgid "Cannot open controlling terminal %s\n"
+msgstr "Ni mogoče odpreti nadzornega terminala %s\n"
+
+#: src/text/textui.c:80
+msgid "Username [anonymous]:"
+msgstr "Uporabniško ime [brezimno]:"
+
+#: src/text/textui.c:158
+#, c-format
+msgid ""
+"%s already exists. (%s source size, %s destination size):\n"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+msgstr ""
+"%s že obstaja. (%s velikost vira, %s velikost cilja):\n"
+"(p)repiši, (n)adaljuj, pre(s)koči, (P)repiši vse, (N)adaljuj vse, Pre(S)koči "
+"vse: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Prekliči"
+
+#~ msgid "Host: "
+#~ msgstr "Gostitelj:"
+
+#~ msgid "User: "
+#~ msgstr "Uporabniško ime:"
+
+#~ msgid "  Close  "
+#~ msgstr " Zapri "
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid "  Yes  "
+#~ msgstr "   Da"
+
+#~ msgid "  No  "
+#~ msgstr "  Ne "
+
+#~ msgid "Type:"
+#~ msgstr "Vrsta:"
+
+#~ msgid "Network Address"
+#~ msgstr "Omrežni naslov"
+
+#~ msgid "_Edit"
+#~ msgstr "_Uredi"
+
+#~ msgid "Apply"
+#~ msgstr "Uveljavi"
diff --git a/po/sq.po b/po/sq.po
index 41d346e..98458e1 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-14 14:36+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-09-03 18:05+0200\n"
 "Last-Translator: Laurent Dhima <laurenti alblinux net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit lists sourceforge net>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s e pavlefshme\n"
@@ -25,80 +26,76 @@ msgstr "URL %s e pavlefshme\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Gabim: Rresht i pavlefshëm %s tek file index i cache\n"
 
-#: lib/cache.c:137 lib/local.c:534
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Gabim: I pamundur krijimi i directory %s: %s\n"
 
-#: lib/cache.c:161
-#, c-format
-#, fuzzy
+#: lib/cache.c:164
+#, fuzzy, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Gabim j"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:262 lib/sshv2.c:1038
-#, c-format
-#, fuzzy
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
+#, fuzzy, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Gabim j"
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
-#, c-format
-#, fuzzy
+#: lib/cache.c:254 lib/fsp.c:127 lib/fsp.c:207 lib/local.c:184 lib/local.c:193
+#: lib/local.c:247
+#, fuzzy, c-format
 msgid "Error: Cannot seek on file %s: %s\n"
 msgstr "Gabim në j"
 
-#: lib/config_file.c:117 lib/config_file.c:124 lib/protocols.c:2803
+#: lib/charset-conv.c:71
 #, c-format
-#, fuzzy
+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:1625
+#, fuzzy, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Gabim hap lokal j"
 
-#: lib/config_file.c:134 lib/protocols.c:2507 lib/sslcommon.c:480
-#, c-format
-#, fuzzy
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
+#, fuzzy, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Gabim nuk socket j"
 
-#: lib/config_file.c:142 lib/protocols.c:2435 lib/sshv2.c:316
-#: lib/sslcommon.c:434
-#, c-format
-#, fuzzy
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
+#, fuzzy, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Gabim nuk socket j"
 
-#: lib/config_file.c:174 lib/config_file.c:730
-#, c-format
-#, fuzzy
+#: lib/config_file.c:183 lib/config_file.c:737
+#, fuzzy, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Gabim emri j"
 
-#: lib/config_file.c:183
-#, c-format
-#, fuzzy
+#: lib/config_file.c:192
+#, fuzzy, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Kujdes gjej j"
 
-#: lib/config_file.c:194 lib/config_file.c:736
-#, c-format
-#, fuzzy
+#: lib/config_file.c:203 lib/config_file.c:743
+#, fuzzy, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP Gabim hap j"
 
-#: lib/config_file.c:286 lib/config_file.c:308
-#, c-format
-#, fuzzy
+#: lib/config_file.c:295 lib/config_file.c:317
+#, fuzzy, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Kujdes në j"
 
-#: lib/config_file.c:338
-#, c-format
-#, fuzzy
+#: lib/config_file.c:347
+#, fuzzy, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Kujdes Linja j"
 
-#: lib/config_file.c:499
+#: lib/config_file.c:504
 #, fuzzy
 msgid ""
 "This section specifies which hosts are on the local subnet and won't need to "
@@ -106,75 +103,67 @@ msgid ""
 "dont_use_proxy=network number/netmask"
 msgstr "në lokal dhe server"
 
-#: lib/config_file.c:502
+#: lib/config_file.c:507
 #, fuzzy
 msgid ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
 "All arguments except the file extension are optional"
 msgstr "Binar A B programi Shënim Gjithçka"
 
-#: lib/config_file.c:580 lib/config_file.c:819
-#, c-format
-#, fuzzy
+#: lib/config_file.c:587 lib/config_file.c:832
+#, fuzzy, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Gabim emri j"
 
-#: lib/config_file.c:591
-#, c-format
-#, fuzzy
+#: lib/config_file.c:598
+#, fuzzy, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP Gabim nuk j"
 
-#: lib/config_file.c:601
-#, c-format
-#, fuzzy
+#: lib/config_file.c:608
+#, fuzzy, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP Gabim gjej j"
 
-#: lib/config_file.c:603
-#, c-format
-#, fuzzy
+#: lib/config_file.c:610
+#, fuzzy, c-format
 msgid "Did you do a make install?\n"
 msgstr "a instalo j"
 
-#: lib/config_file.c:612 lib/config_file.c:825
-#, c-format
-#, fuzzy
+#: lib/config_file.c:619 lib/config_file.c:838
+#, fuzzy, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP Gabim hap j"
 
-#: lib/config_file.c:651
-#, c-format
-#, fuzzy
+#: lib/config_file.c:658
+#, fuzzy, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "në j"
 
-#: lib/config_file.c:657
-#, c-format
-#, fuzzy
+#: lib/config_file.c:664
+#, fuzzy, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP Kujdes në j"
 
-#: lib/config_file.c:664
-#, c-format
-#, fuzzy
+#: lib/config_file.c:671
+#, fuzzy, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP Gabim emri j"
 
-#: lib/config_file.c:670
-#, c-format
-#, fuzzy
+#: lib/config_file.c:677
+#, fuzzy, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Kujdes hap për j"
 
-#: lib/config_file.c:725
+#: lib/config_file.c:732
 #, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 "Libërshënues për gFTP Copyright C<masneyb gftp org> Kujdes komente shto"
+msgstr ""
+"Libërshënues për gFTP Copyright C<masneyb gftp org> Kujdes komente shto"
 
-#: lib/config_file.c:726
+#: lib/config_file.c:733
 #, fuzzy
 msgid ""
 "Note: The passwords contained inside this file are scrambled. This algorithm "
@@ -183,725 +172,712 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr "Shënim është nuk është password nga Parardhës në."
 
-#: lib/config_file.c:832
+#: lib/config_file.c:845
 #, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 "Konfigurim për gFTP Copyright C<masneyb gftp org> Kujdes komente shto a a në komenti gFTP"
+msgstr ""
+"Konfigurim për gFTP Copyright C<masneyb gftp org> Kujdes komente shto a a në "
+"komenti gFTP"
 
-#: lib/config_file.c:1196 lib/rfc2068.c:560 lib/rfc2068.c:561
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr ""
 
-#: lib/config_file.c:1272 lib/config_file.c:1335 lib/config_file.c:1377
-#: lib/config_file.c:1410
-#, c-format
-#, fuzzy
+#: lib/config_file.c:1289 lib/config_file.c:1352 lib/config_file.c:1394
+#: lib/config_file.c:1427
+#, fuzzy, c-format
 msgid "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 msgstr "gFTP Gabim Konfigurim nuk në tabelë j"
 
-#: lib/ftps.c:156
-#, fuzzy
-msgid ""
-"FTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr "Suporti nuk në j"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Gabim hap lokal j"
 
-#: lib/https.c:90
-#, fuzzy
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr "Suporti nuk në j"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Gabim në j"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-#, fuzzy
-msgid "Could not change local directory to %s: %s\n"
-msgstr "nuk lokal j"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Gabim Gabim j"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-#, fuzzy
-msgid "Could not get current working directory: %s\n"
-msgstr "nuk merr j"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "server j"
 
-#: lib/local.c:179
-#, c-format
-#, fuzzy
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Gabim lokal j"
+#: 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 "nuk njihet"
 
-#: lib/local.c:404
-#, c-format
-#, fuzzy
-msgid "Could not get local directory listing %s: %s\n"
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "nuk merr lokal j"
 
-#: lib/local.c:441
-#, c-format
-#, fuzzy
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "lokal j"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:229
-#: src/gtk/view_dialog.c:328
-#, c-format
-#, fuzzy
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "nuk lokal j"
+
+#: 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:304
+#, fuzzy, c-format
 msgid "Successfully removed %s\n"
 msgstr "j"
 
-#: lib/local.c:487
-#, c-format
-#, fuzzy
+#: lib/fsp.c:477 lib/local.c:486
+#, fuzzy, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Gabim nuk hiq j"
 
-#: lib/local.c:510 src/gtk/transfer.c:233 src/gtk/view_dialog.c:332
-#, c-format
-#, fuzzy
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
+#, fuzzy, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Gabim nuk hiq j"
 
-#: lib/local.c:527
-#, c-format
-#, fuzzy
+#: lib/fsp.c:528 lib/local.c:554
+#, fuzzy, c-format
 msgid "Successfully made directory %s\n"
 msgstr "j"
 
-#: lib/local.c:553
-#, c-format
-#, fuzzy
+#: lib/fsp.c:563 lib/local.c:590
+#, fuzzy, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "j"
 
-#: lib/local.c:560
-#, c-format
-#, fuzzy
+#: lib/fsp.c:575 lib/local.c:597
+#, fuzzy, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Gabim nuk j"
 
-#: lib/local.c:583
-#, c-format
+#: lib/ftps.c:156
 #, fuzzy
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "modaliteti nga j"
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr "Suporti nuk në j"
 
-#: lib/local.c:590
-#, c-format
+#: lib/https.c:91
 #, fuzzy
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr "Suporti nuk në j"
+
+#: lib/local.c:66
+#, fuzzy, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr "nuk merr j"
+
+#: lib/local.c:105
+#, fuzzy, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "lokal j"
+
+#: lib/local.c:112
+#, fuzzy, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "nuk lokal j"
+
+#: lib/local.c:238
+#, fuzzy, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Gabim lokal j"
+
+#: lib/local.c:424
+#, fuzzy, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "nuk merr lokal j"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "modaliteti nga j"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Gabim nuk modaliteti nga j"
 
-#: lib/local.c:682
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "modaliteti nga j"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Gabim nuk modaliteti nga j"
+
+#: lib/local.c:750
 #, fuzzy
 msgid "local filesystem"
 msgstr "lokal"
 
-#: lib/misc.c:418
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr ""
 
-#. GRUT modified this item
-#: lib/misc.c:418 src/uicommon/gftpui.c:627
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#. GRUT modified this item
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "asnjë"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr ""
 
-#: lib/options.h:24
+#: lib/options.h:26
 #, fuzzy
 msgid "size"
 msgstr "madhësia"
 
-#. GRUT modified this item
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "përdorues"
 
-#: lib/options.h:25
+#: lib/options.h:27
 #, fuzzy
 msgid "group"
 msgstr "grupi"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#. GRUT modified this item
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: lib/options.h:37
+#: lib/options.h:43
 #, fuzzy
 msgid "View program:"
 msgstr "Paraqitja programi:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 #, fuzzy
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
 msgstr "prezgjedhur programi shfaq është në të bardhë i brendshëm"
 
-#: lib/options.h:40
+#: lib/options.h:46
 #, fuzzy
 msgid "Edit program:"
 msgstr "Ndrysho programi:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 #, fuzzy
 msgid "The default program used to edit files."
 msgstr "prezgjedhur programi ndrysho."
 
-#: lib/options.h:42
-#, fuzzy
-msgid "Startup Directory:"
-msgstr "Directory:"
-
-#: lib/options.h:44
-#, fuzzy
-msgid "The default directory gFTP will go to on startup"
-msgstr "prezgjedhur gFTP në"
-
-#: lib/options.h:45
+#: lib/options.h:48
 #, fuzzy
 msgid "Max Log Window Size:"
 msgstr "Log Dritarja Madhësia:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 #, fuzzy
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "maksimum madhësia nga dritare në bytes për"
 
-#: lib/options.h:49
+#: lib/options.h:52
 #, fuzzy
 msgid "Remote Character Sets:"
 msgstr "Në distancë Simboli:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 #, fuzzy
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr "është a presje lista nga konvertoje në distancë lokale"
 
-#: lib/options.h:53
+#: lib/options.h:56
 #, fuzzy
 msgid "Remote LC_TIME:"
 msgstr "Në distancë:"
 
-#: lib/options.h:55
+#: lib/options.h:58
 #, fuzzy
 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 "është nga për në distancë siti është në."
 
-#: lib/options.h:57
+#: lib/options.h:60
 #, fuzzy
 msgid "Cache TTL:"
 msgstr "Cache TTL:"
 
-#: lib/options.h:60
+#: lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "nga sekonda përpara."
 
-#: lib/options.h:63
+#: lib/options.h:66
 #, fuzzy
 msgid "Append file transfers"
 msgstr "Var (në fund)"
 
-#: lib/options.h:65
+#: lib/options.h:68
 #, fuzzy
 msgid "Append new file transfers onto existing ones"
 msgstr "Var (në fund) i ri"
 
-#: lib/options.h:66
+#: lib/options.h:69
 #, fuzzy
 msgid "Do one transfer at a time"
 msgstr "Bëje a ora"
 
-#: lib/options.h:68
+#: lib/options.h:71
 #, fuzzy
 msgid "Do only one transfer at a time?"
 msgstr "Bëje a ora?"
 
-#: lib/options.h:69
+#: lib/options.h:72
 #, fuzzy
 msgid "Overwrite by Default"
 msgstr "Mbishkruaj nga E prezgjedhur"
 
-#: lib/options.h:72
+#: lib/options.h:75
 #, fuzzy
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Mbishkruaj nga prezgjedhur"
 
-#: lib/options.h:74
+#: lib/options.h:77
 #, fuzzy
 msgid "Preserve file permissions"
 msgstr "të drejtat"
 
-#: lib/options.h:77
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
+msgstr "të drejtat nga"
+
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "të drejtat"
+
+#: lib/options.h:85
 #, fuzzy
-msgid "Preserve file permissions of transfered files"
+msgid "Preserve file times of transferred files"
 msgstr "të drejtat nga"
 
-#: lib/options.h:79
+#: lib/options.h:87
 #, fuzzy
 msgid "Refresh after each file transfer"
 msgstr "Rifresko mbas"
 
-#: lib/options.h:82
+#: lib/options.h:90
 #, fuzzy
-msgid "Refresh the listbox after each file is transfered"
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Rifresko mbas është"
 
-#: lib/options.h:84
+#: lib/options.h:92
 #, fuzzy
 msgid "Sort directories first"
 msgstr "Renditja i pari"
 
-#: lib/options.h:87
+#: lib/options.h:95
 #, fuzzy
 msgid "Put the directories first then the files"
 msgstr "i pari"
 
-#: lib/options.h:88
+#: lib/options.h:96
 #, fuzzy
 msgid "Show hidden files"
 msgstr "Shfaq"
 
-#: lib/options.h:91
+#: lib/options.h:99
 #, fuzzy
 msgid "Show hidden files in the listboxes"
 msgstr "Shfaq në"
 
-#: lib/options.h:92
+#: lib/options.h:100
 #, fuzzy
 msgid "Show transfer status in title"
 msgstr "Shfaq gjendja në titulli"
 
-#: lib/options.h:94
+#: lib/options.h:102
 #, fuzzy
 msgid "Show the file transfer status in the titlebar"
 msgstr "Shfaq gjendja në"
 
-#: lib/options.h:95
+#: lib/options.h:103
 #, fuzzy
 msgid "Start file transfers"
 msgstr "Fillo"
 
-#: lib/options.h:97
+#: lib/options.h:105
 #, fuzzy
 msgid "Automatically start the file transfers when they get queued"
 msgstr "nisje merr"
 
-#: lib/options.h:99
+#: lib/options.h:107
 #, fuzzy
 msgid "Allow manual commands in GUI"
 msgstr "Lejo manual në GUI (interfaqja)"
 
-#: lib/options.h:101
+#: lib/options.h:109
 #, fuzzy
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "Lejo manual në GUI (interfaqja) tekst"
 
-#. GRUT modified this item
-#: lib/options.h:103 src/gtk/options_dialog.c:1049
-#: src/gtk/options_dialog.c:1142
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Hiq a lokal"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Rrjeti"
 
-#: lib/options.h:105
+#: lib/options.h:122
 #, fuzzy
 msgid "Network timeout:"
 msgstr "Rrjeti:"
 
-#: lib/options.h:108
+#: lib/options.h:125
 #, fuzzy
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "për është."
 
-#: lib/options.h:110
+#: lib/options.h:127
 #, fuzzy
 msgid "Connect retries:"
 msgstr "Lidhu:"
 
-#: lib/options.h:113
+#: lib/options.h:130
 #, fuzzy
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "nga"
 
-#: lib/options.h:115
+#: lib/options.h:132
 #, fuzzy
 msgid "Retry sleep time:"
 msgstr "Anullo ora:"
 
-#: lib/options.h:118
+#: lib/options.h:135
 #, fuzzy
 msgid "The number of seconds to wait between retries"
 msgstr "nga sekonda"
 
-#: lib/options.h:119
+#: lib/options.h:136
 #, fuzzy
 msgid "Max KB/S:"
 msgstr "KB S:"
 
-#: lib/options.h:122
+#: lib/options.h:139
 #, fuzzy
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "maksimum KB a merr ç'aktivo"
 
-#: lib/options.h:125
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "Transferimi Files"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 #, fuzzy
 msgid "Default Protocol:"
 msgstr "E prezgjedhur Protokolli:"
 
-#: lib/options.h:127
+#: lib/options.h:149
 #, fuzzy
 msgid "This specifies the default protocol to use"
 msgstr "prezgjedhur"
 
-#: lib/options.h:129 lib/options.h:132
+#: lib/options.h:151 lib/options.h:154
 #, fuzzy
 msgid "Enable IPv6 support"
 msgstr "Aktivo"
 
-#: lib/options.h:137
+#: lib/options.h:159
 #, fuzzy
 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 "a në Paraqitja Ndrysho Transferimi"
 
-#: lib/options.h:140
+#: lib/options.h:162
 #, fuzzy
 msgid "The default width of the local files listbox"
 msgstr "prezgjedhur gjerësia nga lokal"
 
-#: lib/options.h:143
+#: lib/options.h:165
 #, fuzzy
 msgid "The default width of the remote files listbox"
 msgstr "prezgjedhur gjerësia nga në distancë"
 
-#: lib/options.h:146
+#: lib/options.h:168
 #, fuzzy
 msgid "The default height of the local/remote files listboxes"
 msgstr "prezgjedhur lartësia nga lokal në distancë"
 
-#: lib/options.h:149
+#: lib/options.h:171
 #, fuzzy
 msgid "The default height of the transfer listbox"
 msgstr "prezgjedhur lartësia nga"
 
-#: lib/options.h:152
+#: lib/options.h:174
 #, fuzzy
 msgid "The default height of the logging window"
 msgstr "prezgjedhur lartësia nga dritare"
 
-#: lib/options.h:155
+#: lib/options.h:177
 #, fuzzy
 msgid ""
 "The width of the filename column in the transfer window. Set this to 0 to "
 "have this column automagically resize."
 msgstr "gjerësia nga në dritare."
 
-#: lib/options.h:159 lib/options.h:165
+#: lib/options.h:190 lib/options.h:196
 #, fuzzy
 msgid "The default column to sort by"
 msgstr "prezgjedhur nga"
 
-#: lib/options.h:162 lib/options.h:168
+#: lib/options.h:193 lib/options.h:199
 #, fuzzy
 msgid "Sort ascending or descending"
 msgstr "Renditja"
 
-#: lib/options.h:172 lib/options.h:190
+#: lib/options.h:203 lib/options.h:221
 #, fuzzy
 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 "gjerësia nga në ç'aktivo"
 
-#: lib/options.h:175 lib/options.h:193
+#: lib/options.h:206 lib/options.h:224
 #, fuzzy
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr "gjerësia nga madhësia në ç'aktivo"
 
-#: lib/options.h:178 lib/options.h:196
+#: lib/options.h:209 lib/options.h:227
 #, fuzzy
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr "gjerësia nga përdorues në ç'aktivo"
 
-#: lib/options.h:181 lib/options.h:199
+#: lib/options.h:212 lib/options.h:230
 #, fuzzy
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr "gjerësia nga grupi në ç'aktivo"
 
-#: lib/options.h:184 lib/options.h:202
+#: lib/options.h:215 lib/options.h:233
 #, fuzzy
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr "gjerësia nga data në ç'aktivo"
 
-#: lib/options.h:187 lib/options.h:205
+#: lib/options.h:218 lib/options.h:236
 #, fuzzy
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr "gjerësia nga në ç'aktivo"
 
-#: lib/options.h:208
+#: lib/options.h:239
 #, fuzzy
 msgid "The color of the commands that are sent to the server"
 msgstr "nga server"
 
-#: lib/options.h:211
+#: lib/options.h:242
 #, fuzzy
 msgid "The color of the commands that are received from the server"
 msgstr "nga server"
 
-#: lib/options.h:214
+#: lib/options.h:245
 #, fuzzy
 msgid "The color of the error messages"
 msgstr "nga gabim"
 
-#: lib/options.h:217
+#: lib/options.h:248
 #, fuzzy
 msgid "The color of the rest of the log messages"
 msgstr "nga nga"
 
-#. GRUT modified this item
-#: lib/options.h:223 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:226 lib/options.h:228
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr ""
 
-#. GRUT modified this item
-#: lib/options.h:231 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:234 lib/options.h:236
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr ""
 
-#. GRUT modified this item
-#: lib/options.h:239
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokale"
 
-#: lib/options.h:241
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
-#. GRUT modified this item
-#: lib/options.h:243 src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Libërshënues"
 
-#: lib/protocols.c:222
-#, c-format
+#: lib/options.h:275
 #, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
+#, fuzzy, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "File KB j"
 
-#: lib/protocols.c:362
-#, c-format
-#, fuzzy
+#: lib/protocols.c:379
+#, fuzzy, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Gabim mbrapa j"
 
-#: lib/protocols.c:370
-#, c-format
-#, fuzzy
+#: lib/protocols.c:390
+#, fuzzy, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "j"
 
-#: lib/protocols.c:380
-#, c-format
-#, fuzzy
+#: lib/protocols.c:400
+#, fuzzy, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "server j"
 
-#: lib/protocols.c:576
+#: lib/protocols.c:450
 #, c-format
-#, fuzzy
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
+msgstr ""
+
+#: lib/protocols.c:481
+#, fuzzy, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Gabim j"
 
-#: lib/protocols.c:608
-#, c-format
-#, fuzzy
+#: lib/protocols.c:514
+#, fuzzy, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Gabim nuk gjej j"
 
-#: lib/protocols.c:615
-#, c-format
-#, fuzzy
+#: lib/protocols.c:521
+#, fuzzy, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Libërshënues Gabim nuk a emri i host j"
 
-#: lib/protocols.c:724
-#, c-format
-#, fuzzy
+#: lib/protocols.c:643 lib/protocols.c:670
+#, fuzzy, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "është nuk j"
 
-#: lib/protocols.c:1067 lib/protocols.c:1082 lib/protocols.c:2029
-#: lib/protocols.c:2136
-#, c-format
-#, fuzzy
-msgid "Looking up %s\n"
-msgstr "sipër j"
-
-#: lib/protocols.c:1073 lib/protocols.c:1088 lib/protocols.c:2034
-#: lib/protocols.c:2141
-#, c-format
-#, fuzzy
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "sipër emri i host j"
-
-#. GRUT modified this item
-#: lib/protocols.c:1386 lib/protocols.c:1387 lib/protocols.c:1428
-#: lib/protocols.c:1429 lib/protocols.c:1489 lib/protocols.c:1496
-#: lib/protocols.c:1573 lib/protocols.c:1574 lib/protocols.c:1608
-msgid "unknown"
-msgstr "nuk njihet"
-
-#: lib/protocols.c:2052
-#, c-format
-#, fuzzy
-msgid "Failed to create a socket: %s\n"
-msgstr "Dështoi a socket j"
-
-#: lib/protocols.c:2058 lib/protocols.c:2155
-#, c-format
-#, fuzzy
-msgid "Trying %s:%d\n"
-msgstr "j"
-
-#: lib/protocols.c:2063 lib/protocols.c:2162
-#, c-format
-#, fuzzy
-msgid "Cannot connect to %s: %s\n"
-msgstr "j"
-
-#: lib/protocols.c:2095 lib/rfc959.c:628
-#, c-format
-#, fuzzy
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Dështoi a socket j"
-
-#: lib/protocols.c:2119 lib/sshv2.c:947
-#, c-format
-#, fuzzy
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "sipër emri j"
-
-#: lib/protocols.c:2178 lib/protocols.c:2812 lib/rfc959.c:637 lib/rfc959.c:791
-#, c-format
-#, fuzzy
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Gabim mbylle në j"
-
-#: lib/protocols.c:2185
+#: lib/protocols.c:1153
 #, c-format
-#, fuzzy
-msgid "Connected to %s:%d\n"
-msgstr "I lidhur j"
-
-#: lib/protocols.c:2415 lib/protocols.c:2486 lib/sshv2.c:307
-#, c-format
-#, fuzzy
-msgid "Connection to %s timed out\n"
-msgstr "Lidhja j"
-
-#: lib/protocols.c:2555
-#, c-format
-#, fuzzy
-msgid "Cannot get socket flags: %s\n"
-msgstr "merr socket j"
-
-#: lib/protocols.c:2569
-#, c-format
-#, fuzzy
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "socket j"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:2706
-#, c-format
-#, fuzzy
+#: lib/protocols.c:1531
+#, fuzzy, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "Gabim Në distancë siti sipër j"
 
-#: lib/protocols.c:2714
-#, c-format
-#, fuzzy
+#: lib/protocols.c:1539
+#, fuzzy, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Gabim Në distancë siti në sekonda j"
 
-#: lib/pty.c:296
-#, c-format
-#, fuzzy
+#: lib/protocols.c:1634 lib/rfc959.c:715 lib/rfc959.c:885
+#: lib/socket-connect.c:126
+#, fuzzy, c-format
+msgid "Error: Cannot set close on exec flag: %s\n"
+msgstr "Gabim mbylle në j"
+
+#: lib/pty.c:301
+#, fuzzy, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "hap j"
 
-#: lib/pty.c:304
-#, c-format
-#, fuzzy
+#: lib/pty.c:309
+#, fuzzy, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "a socket j"
 
-#: lib/pty.c:332
-#, c-format
-#, fuzzy
+#: lib/pty.c:338
+#, fuzzy, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Gabim ekzekuto j"
 
-#: lib/pty.c:348
-#, c-format
-#, fuzzy
+#: lib/pty.c:354
+#, fuzzy, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "duplikim j"
 
-#. GRUT modified this item
 #: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Emri i serverit proxy:"
@@ -911,7 +887,6 @@ msgstr "Emri i serverit proxy:"
 msgid "Firewall hostname"
 msgstr "Firewall emri i host"
 
-#. GRUT modified this item
 #: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Porta e Proxy:"
@@ -951,48 +926,34 @@ msgstr "HTTP 1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Bëje 0"
 
-#: lib/rfc2068.c:153 lib/rfc2068.c:853
-#, c-format
-#, fuzzy
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
+#, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "Marrë server madhësia nga në distancë server j"
 
-#: lib/rfc2068.c:257 lib/rfc959.c:597 lib/sshv2.c:1033
-#, c-format
-#, fuzzy
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
+#, fuzzy, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "siti j"
 
-#: lib/rfc2068.c:307
-#, c-format
+#: lib/rfc2068.c:301
 #, fuzzy
-msgid "Starting the file transfer at offset %lld\n"
+msgid "Starting the file transfer at offset "
 msgstr "Duke filluar j"
 
-#: lib/rfc2068.c:315
-#, c-format
-#, fuzzy
-msgid "Starting the file transfer at offset %ld\n"
-msgstr "Duke filluar j"
-
-#: lib/rfc2068.c:336
-#, c-format
-#, fuzzy
+#: lib/rfc2068.c:322
+#, fuzzy, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "j"
 
-#: lib/rfc2068.c:435 lib/sshv2.c:1118
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 #, fuzzy
 msgid "Retrieving directory listing...\n"
 msgstr "j"
 
-#: lib/rfc2068.c:834 lib/sshv2.c:771 lib/sshv2.c:784 lib/sshv2.c:806
-#: lib/sshv2.c:874 lib/sshv2.c:989 lib/sshv2.c:1080 lib/sshv2.c:1148
-#: lib/sshv2.c:1261 lib/sshv2.c:1274 lib/sshv2.c:1287 lib/sshv2.c:1300
-#: lib/sshv2.c:1356 lib/sshv2.c:1421 lib/sshv2.c:1881 lib/sshv2.c:1984
-#: lib/sshv2.c:2078 lib/sshv2.c:2163 lib/sshv2.c:2249
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 #, fuzzy
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Marrë server j"
@@ -1026,7 +987,6 @@ msgstr ""
 msgid "HTTP Proxy"
 msgstr "Proxy"
 
-#. GRUT modified this item
 #: lib/rfc959.c:34
 msgid "Custom"
 msgstr "E personalizuar"
@@ -1058,8 +1018,7 @@ msgid "Proxy server type:"
 msgstr "Proxy server lloji:"
 
 #: lib/rfc959.c:66
-#, no-c-format
-#, fuzzy
+#, fuzzy, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
 "2 character replacement string prefixed by a % that will be replaced with "
@@ -1067,13 +1026,27 @@ 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 "server në Ti a nga a me i pari për për nga FTP server sekondë përdorues a përdorues lloji në"
+msgstr ""
+"server në Ti a nga a me i pari për për nga FTP server sekondë përdorues a "
+"përdorues lloji në"
 
 #: lib/rfc959.c:69
-msgid "Passive file transfers"
+msgid "Ignore PASV address"
 msgstr ""
 
 #: 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 ""
+
+#: lib/rfc959.c:74
+msgid "Passive file transfers"
+msgstr ""
+
+#: lib/rfc959.c:77
 #, fuzzy
 msgid ""
 "If this is enabled, then the remote FTP server will open up a port for the "
@@ -1082,114 +1055,168 @@ msgid ""
 "to an older FTP server that doesn't support this. If this is disabled, then "
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
-msgstr "është aktiv në distancë FTP server hap sipër a për a aktiv është a aktiv e(i) vjetër FTP server 
është jo aktiv gFTP hap sipër a në dhe në distancë server."
+msgstr ""
+"është aktiv në distancë FTP server hap sipër a për a aktiv është a aktiv e"
+"(i) vjetër FTP server është jo aktiv gFTP hap sipër a në dhe në distancë "
+"server."
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 #, fuzzy
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Në distancë LISTË L"
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:82
 #, fuzzy
 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
-msgstr "në distancë FTP server në është a aktiv ora ç'aktivo është në distancë FTP server L LISTË"
+msgstr ""
+"në distancë FTP server në është a aktiv ora ç'aktivo është në distancë "
+"FTP server L LISTË"
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 #, fuzzy
 msgid "Transfer files in ASCII mode"
 msgstr "Transferimi në ASCII modaliteti"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
 #, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr "a tekst Dritaret aktiv sistemi për tekst është ç'aktivo."
 
-#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337 lib/rfc959.c:755
-#: lib/rfc959.c:1359
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
+#, fuzzy, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "E pavlefshme server j"
 
-#: lib/rfc959.c:667 lib/rfc959.c:677
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, fuzzy, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Dështoi a socket j"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
+#, fuzzy, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "gjej në j"
 
-#: lib/rfc959.c:692 lib/rfc959.c:853
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "gjej në j"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
+#, fuzzy, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "a j"
 
-#: lib/rfc959.c:704 lib/rfc959.c:725 lib/rfc959.c:878
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
+#, fuzzy, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "merr socket emri j"
 
-#: lib/rfc959.c:715 lib/rfc959.c:868
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:809 lib/rfc959.c:960
+#, fuzzy, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "a j"
 
-#: lib/rfc959.c:734 lib/rfc959.c:887
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:828 lib/rfc959.c:979
+#, fuzzy, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "në j"
 
-#: lib/rfc959.c:782
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:876
+#, fuzzy, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Dështoi a socket j"
 
-#: lib/rfc959.c:802
+#: lib/rfc959.c:895
 #, fuzzy
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Gabim j"
 
-#: lib/rfc959.c:831 lib/rfc959.c:840
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:923 lib/rfc959.c:932
+#, fuzzy, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "E pavlefshme j"
 
-#: lib/rfc959.c:897
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:989
+#, fuzzy, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "merr nga lokal socket j"
 
-#: lib/rfc959.c:971
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:1076
+#, fuzzy, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "server j"
 
-#: lib/rfc959.c:1501
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr ""
 
-#: lib/rfc959.c:1503
-#, c-format
-#, fuzzy
+#: lib/rfc959.c:1586
+#, fuzzy, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Kujdes j"
 
-#. GRUT modified this item
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, fuzzy, c-format
+msgid "Looking up %s\n"
+msgstr "sipër j"
+
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
+#, fuzzy, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "sipër emri i host j"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, fuzzy, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Dështoi a socket j"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, fuzzy, c-format
+msgid "Trying %s:%d\n"
+msgstr "j"
+
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
+#, fuzzy, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr "j"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, fuzzy, c-format
+msgid "Connected to %s:%d\n"
+msgstr "I lidhur j"
+
+#: lib/socket-connect-gethostbyname.c:101 lib/sshv2.c:1168
+#, fuzzy, c-format
+msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgstr "sipër emri j"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, fuzzy, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Lidhja j"
+
+#: lib/sockutils.c:338
+#, fuzzy, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "merr socket j"
+
+#: lib/sockutils.c:352
+#, fuzzy, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "socket j"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -1214,223 +1241,203 @@ msgstr "SSH Shtesë:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Shtesë SSH programi"
 
-#: lib/sshv2.c:37
-#, fuzzy
-msgid "SSH2 sftp-server path:"
-msgstr "server shtegu:"
-
-#: lib/sshv2.c:39
-#, fuzzy
-msgid "Default remote SSH2 sftp-server path"
-msgstr "E prezgjedhur në distancë server shtegu"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 #, fuzzy
 msgid "Need SSH User/Pass"
 msgstr "SSH Përdoruesi"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 #, fuzzy
 msgid "Require a username/password for SSH connections"
 msgstr "a përdoruesi password për SSH"
 
-#: lib/sshv2.c:45
-msgid "Use SSH2 SFTP subsys"
+#: lib/sshv2.c:369
+#, fuzzy, c-format
+msgid "Running program %s\n"
+msgstr "Në ekzekutim programi j"
+
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:48
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
+msgstr ""
+
+#: lib/sshv2.c:380
 #, fuzzy
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr "Thirrje me është në distancë shtegu në distancë server"
+msgid "Password"
+msgstr "Fjalëkalimi:"
 
-#: lib/sshv2.c:254
-#, c-format
+#: lib/sshv2.c:381
 #, fuzzy
-msgid "Running program %s\n"
-msgstr "Në ekzekutim programi j"
+msgid "password"
+msgstr "Fjalëkalimi:"
 
-#. GRUT modified this item
-#: lib/sshv2.c:350 lib/sshv2.c:374
-msgid "WARNING"
-msgstr "KUJDES"
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
+msgstr ""
 
-#: lib/sshv2.c:431
-#, fuzzy
-msgid "Error: An incorrect password was entered\n"
-msgstr "Gabim password j"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
+msgstr ""
 
-#: lib/sshv2.c:434
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Shkruaj fjalëkalimin"
+
+#: lib/sshv2.c:519
 #, fuzzy
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr "j"
+msgid "Enter SecurID Password:"
+msgstr "Shkruaj fjalëkalimin"
 
-#: lib/sshv2.c:473
-#, c-format
+#: lib/sshv2.c:567
 #, fuzzy
+msgid "Error: An incorrect password was entered\n"
+msgstr "Gabim password j"
+
+#: lib/sshv2.c:596
+#, fuzzy, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "Protokolli j"
 
-#: lib/sshv2.c:479
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:600
+#, fuzzy, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "Protokolli versioni j"
 
-#: lib/sshv2.c:488
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:609
+#, fuzzy, c-format
 msgid "%d: Open %s\n"
 msgstr "Hap j"
 
-#: lib/sshv2.c:493
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:614
+#, fuzzy, c-format
 msgid "%d: Close\n"
 msgstr "Mbyll j"
 
-#: lib/sshv2.c:499
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:618
+#, fuzzy, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "Hap Directory j"
 
-#: lib/sshv2.c:504
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:623
+#, fuzzy, c-format
 msgid "%d: Read Directory\n"
 msgstr "Lexo Directory j"
 
-#: lib/sshv2.c:508
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:627
+#, fuzzy, c-format
 msgid "%d: Remove file %s\n"
 msgstr "Hiq j"
 
-#: lib/sshv2.c:513
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:632
+#, fuzzy, c-format
 msgid "%d: Make directory %s\n"
 msgstr "j"
 
-#: lib/sshv2.c:518
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:637
+#, fuzzy, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "Hiq j"
 
-#: lib/sshv2.c:523
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:642
+#, fuzzy, c-format
 msgid "%d: Realpath %s\n"
 msgstr "j"
 
-#: lib/sshv2.c:528
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:647
+#, fuzzy, c-format
 msgid "%d: File attributes\n"
 msgstr "File j"
 
-#: lib/sshv2.c:532
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:651
+#, fuzzy, c-format
 msgid "%d: Stat %s\n"
 msgstr "j"
 
-#: lib/sshv2.c:549
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:671
+#, fuzzy, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "j"
 
-#: lib/sshv2.c:554
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:676
+#, fuzzy, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "j"
 
-#. GRUT modified this item
-#: lib/sshv2.c:567 src/gtk/bookmarks.c:1042 src/gtk/bookmarks.c:1296
-#: src/gtk/chmod_dialog.c:260 src/gtk/gtkui_transfer.c:361
-#: src/gtk/misc-gtk.c:970 src/gtk/options_dialog.c:1107
-#: src/gtk/options_dialog.c:1309
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: lib/sshv2.c:570
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr ""
 
-#: lib/sshv2.c:573
+#: lib/sshv2.c:696
 #, fuzzy
 msgid "No such file or directory"
 msgstr "Jo"
 
-#. GRUT modified this item
-#. GRUT modified this item
-#: lib/sshv2.c:576
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Ndalohet hyrja"
 
-#: lib/sshv2.c:579
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr ""
 
-#: lib/sshv2.c:582
+#: lib/sshv2.c:705
 #, fuzzy
 msgid "Bad message"
 msgstr "mesazh"
 
-#: lib/sshv2.c:585
+#: lib/sshv2.c:708
 #, fuzzy
 msgid "No connection"
 msgstr "Jo"
 
-#: lib/sshv2.c:588
+#: lib/sshv2.c:711
 #, fuzzy
 msgid "Connection lost"
 msgstr "Lidhja"
 
-#: lib/sshv2.c:591
+#: lib/sshv2.c:714
 #, fuzzy
 msgid "Operation unsupported"
 msgstr "Veprimi"
 
-#: lib/sshv2.c:594
+#: lib/sshv2.c:717
 #, fuzzy
 msgid "Unknown message returned from server"
 msgstr "Nuk njihet mesazh server"
 
-#: lib/sshv2.c:631
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:752
+#, fuzzy, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Gabim Mesazh madhësia j"
 
-#: lib/sshv2.c:689 lib/sshv2.c:1157 lib/sshv2.c:1993 lib/sshv2.c:2087
-#: lib/sshv2.c:2175
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:811 lib/sshv2.c:1346 lib/sshv2.c:1838 lib/sshv2.c:1957
+#, fuzzy, c-format
 msgid "Error: Message size %d too big from server\n"
 msgstr "Gabim Mesazh madhësia server j"
 
-#: lib/sshv2.c:695
+#: lib/sshv2.c:817
 #, fuzzy
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
-msgstr "gabim a SSH me në distancë server gabim mesazh në distancë server j"
+msgstr ""
+"gabim a SSH me në distancë server gabim mesazh në distancë server j"
 
-#: lib/sshv2.c:924
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:1160
+#, fuzzy, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH j"
 
-#: lib/sshv2.c:1000
-#, c-format
-#, fuzzy
+#: lib/sshv2.c:1212
+#, fuzzy, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH server j"
 
@@ -1463,8 +1470,7 @@ msgid "Verify SSL Peer"
 msgstr "Verifikimi"
 
 #: lib/sslcommon.c:107
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
 "Issuer = %s\n"
@@ -1477,70 +1483,59 @@ msgstr "Gabim me j"
 msgid "Cannot get peer certificate\n"
 msgstr "merr j"
 
-#: lib/sslcommon.c:188
-#, c-format
-#, fuzzy
+#: lib/sslcommon.c:196
+#, fuzzy, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr "GABIM në nuk j"
 
-#: lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 #, fuzzy
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL j"
 
-#: lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 #, fuzzy
 msgid "Error loading default SSL certificates\n"
 msgstr "Gabim prezgjedhur j"
 
-#: lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 #, fuzzy
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Gabim lista jo j"
 
-#: lib/sslcommon.c:342 lib/sslcommon.c:414 lib/sslcommon.c:461
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 #, fuzzy
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Gabim nuk j"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 #, fuzzy
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Gabim sipër j"
 
-#: lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 #, fuzzy
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Gabim sipër j"
 
-#: lib/sslcommon.c:390
-#, c-format
-#, fuzzy
+#: lib/sslcommon.c:392
+#, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Gabim me j"
 
-#: src/uicommon/gftpui.c:70
-#, c-format
-#, fuzzy
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Në pritje sekonda deri më j"
-
-#: src/uicommon/gftpui.c:80 src/gtk/delete_dialog.c:89 src/gtk/transfer.c:213
+#: src/uicommon/gftpui.c:56
 #, fuzzy
 msgid "Operation canceled\n"
 msgstr "Veprimi j"
 
-#: src/uicommon/gftpui.c:157
-#, fuzzy
-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 "çdo komente informacione programi Ti gjithmonë gjej informacione gFTPhttp://www.gftp.org/ j"
+#: src/uicommon/gftpui.c:65
+#, fuzzy, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Në pritje sekonda deri më j"
 
-#: src/uicommon/gftpui.c:158
+#: src/uicommon/gftpui.c:156
 #, fuzzy
 msgid ""
 "gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. "
@@ -1548,403 +1543,408 @@ msgid ""
 "conditions; for details, see the COPYING file\n"
 msgstr "gFTP me JO për detajet është dhe për detajet j"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:160 src/gtk/menu-items.c:497
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "Përkthyer nga"
 
-#: 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:394
-#: src/uicommon/gftpui.c:430 src/uicommon/gftpui.c:493
-#: src/uicommon/gftpui.c:574 src/uicommon/gftpui.c:840
+#: 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
 #, fuzzy
 msgid "Error: Not connected to a remote site\n"
 msgstr "Gabim Not a në distancë siti j"
 
-#: src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 #, fuzzy
 msgid "usage: chmod <mode> <file>\n"
 msgstr "<mode><file> j"
 
-#: src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 #, fuzzy
 msgid "usage: rename <old name> <new name>\n"
 msgstr "<old name><new name> j"
 
-#: src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 #, fuzzy
 msgid "usage: delete <file>\n"
 msgstr "elemino<file> j"
 
-#: src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 #, fuzzy
 msgid "usage: rmdir <directory>\n"
 msgstr "<directory> j"
 
-#: src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 #, fuzzy
 msgid "usage: site <site command>\n"
 msgstr "siti<site command> j"
 
-#: src/uicommon/gftpui.c:400
+#: src/uicommon/gftpui.c:399
 #, fuzzy
 msgid "usage: mkdir <new directory>\n"
 msgstr "<new directory> j"
 
-#: src/uicommon/gftpui.c:436 src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 #, fuzzy
 msgid "usage: chdir <directory>\n"
 msgstr "<directory> j"
 
-#: src/uicommon/gftpui.c:525
+#: src/uicommon/gftpui.c:526
 #, fuzzy
 msgid "Invalid argument\n"
 msgstr "E pavlefshme j"
 
-#: src/uicommon/gftpui.c:538
+#: src/uicommon/gftpui.c:539
 #, fuzzy
 msgid "Clear the directory cache\n"
 msgstr "Pastro j"
 
-#: src/uicommon/gftpui.c:627
+#: src/uicommon/gftpui.c:628
 #, fuzzy
 msgid "usage: open "
 msgstr "hap "
 
-#: src/uicommon/gftpui.c:703
+#: src/uicommon/gftpui.c:704
 #, fuzzy
 msgid "usage: set [variable = value]\n"
 msgstr "j"
 
-#: src/uicommon/gftpui.c:717
-#, c-format
-#, fuzzy
+#: src/uicommon/gftpui.c:718
+#, fuzzy, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Gabim E ndryshueshme është nuk a j"
 
-#: src/uicommon/gftpui.c:724
-#, c-format
-#, fuzzy
+#: src/uicommon/gftpui.c:725
+#, fuzzy, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Gabim E ndryshueshme është nuk në tekst nga gFTP j"
 
-#: src/uicommon/gftpui.c:804
+#: src/uicommon/gftpui.c:807
 #, fuzzy
 msgid ""
 "Supported commands:\n"
 "\n"
 msgstr "j j"
 
-#: src/uicommon/gftpui.c:847
-#, c-format
-#, fuzzy
+#: src/uicommon/gftpui.c:852
+#, fuzzy, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "<filespec> j"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:932
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "informacione"
 
-#: src/uicommon/gftpui.c:933
+#: src/uicommon/gftpui.c:938
 #, fuzzy
 msgid "Shows gFTP information"
 msgstr "gFTP"
 
-#: src/uicommon/gftpui.c:934
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr ""
 
-#: src/uicommon/gftpui.c:935
+#: src/uicommon/gftpui.c:940
 #, fuzzy
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "modaliteti për FTP"
 
-#: src/uicommon/gftpui.c:936
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr ""
 
-#: src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:942
 #, fuzzy
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "modaliteti Binar për FTP"
 
-#: src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:939 src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 #, fuzzy
 msgid "Changes the remote working directory"
 msgstr "në distancë"
 
-#: src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr ""
 
-#: src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:948
 #, fuzzy
 msgid "Changes the permissions of a remote file"
 msgstr "të drejtat nga a në distancë"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:944
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "pastro"
 
-#: src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:950
 #, fuzzy
 msgid "Available options: cache"
 msgstr "Në dispozicion"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "mbylle"
 
-#: src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:952
 #, fuzzy
 msgid "Disconnects from the remote site"
 msgstr "në distancë siti"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "elemino"
 
-#: src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:954
 #, fuzzy
 msgid "Removes a remote file"
 msgstr "a në distancë"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:955
+msgid "dir"
+msgstr ""
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+#, fuzzy
+msgid "Shows the directory listing for the current remote directory"
+msgstr "për në distancë"
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "merr"
 
-#: src/uicommon/gftpui.c:951 src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 #, fuzzy
 msgid "Downloads remote file(s)"
 msgstr "Shkarkime në distancë"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "ndihmë"
 
-#: src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:960
 #, fuzzy
 msgid "Shows this help screen"
 msgstr "ndihmë"
 
-#: src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:955 src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 #, fuzzy
 msgid "Changes the local working directory"
 msgstr "lokal"
 
-#: src/uicommon/gftpui.c:956
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:958
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr ""
 
-#: src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:966
 #, fuzzy
 msgid "Changes the permissions of a local file"
 msgstr "të drejtat nga a lokal"
 
-#: src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr ""
 
-#: src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:968
 #, fuzzy
 msgid "Removes a local file"
 msgstr "a lokal"
 
-#: src/uicommon/gftpui.c:962
-msgid "lls"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 #, fuzzy
 msgid "Shows the directory listing for the current local directory"
 msgstr "për lokal"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr ""
+
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:974
 #, fuzzy
 msgid "Creates a local directory"
 msgstr "a lokal"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:976
 #, fuzzy
 msgid "Show current local directory"
 msgstr "Shfaq lokal"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr ""
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:978
 #, fuzzy
 msgid "Rename a local file"
 msgstr "Riemërto a lokal"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:980
 #, fuzzy
 msgid "Remove a local directory"
 msgstr "Hiq a lokal"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr ""
 
-#: src/uicommon/gftpui.c:973
-#, fuzzy
-msgid "Shows the directory listing for the current remote directory"
-msgstr "për në distancë"
-
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr ""
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:986
 #, fuzzy
 msgid "Creates a remote directory"
 msgstr "a në distancë"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr ""
 
-#: src/uicommon/gftpui.c:979 src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 #, fuzzy
 msgid "Uploads local file(s)"
 msgstr "Ngarkime lokal"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "hap"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:990
 #, fuzzy
 msgid "Opens a connection to a remote site"
 msgstr "a a në distancë siti"
 
-#: src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr ""
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr ""
 
-#: src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:994
 #, fuzzy
 msgid "Show current remote directory"
 msgstr "Shfaq në distancë"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "dil"
 
-#: src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:996
 #, fuzzy
 msgid "Exit from gFTP"
 msgstr "Dalja gFTP"
 
-#: src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr ""
 
-#: src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:998
 #, fuzzy
 msgid "Rename a remote file"
 msgstr "Riemërto a në distancë"
 
-#: src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr ""
 
-#: src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:1000
 #, fuzzy
 msgid "Remove a remote directory"
 msgstr "Hiq a në distancë"
 
-#: src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr ""
 
-#: src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:1002
 #, fuzzy
-msgid "Show configuration file variables. You can also set variables by set var=val"
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr "Shfaq Ti nga"
 
-#. GRUT modified this item
-#: src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "siti"
 
-#: src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "Ekzekuto a siti"
 
-#: src/uicommon/gftpui.c:1086
+#: src/uicommon/gftpui.c:1094
 #, fuzzy
 msgid "Error: Command not recognized\n"
 msgstr "Gabim Komanda nuk j"
 
-#: src/uicommon/gftpui.c:1336
-#, fuzzy
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "Gabim Në distancë siti mbas j"
+#: src/uicommon/gftpui.c:1304
+#, fuzzy, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "KB j"
 
-#: src/uicommon/gftpui.c:1405
-#, c-format
-#, fuzzy
+#: src/uicommon/gftpui.c:1335
+#, fuzzy, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "në j"
+
+#: src/uicommon/gftpui.c:1359
+#, fuzzy, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "në j"
+
+#: src/uicommon/gftpui.c:1505
+#, fuzzy, c-format
 msgid "Could not download %s from %s\n"
 msgstr "nuk j"
 
-#: src/uicommon/gftpui.c:1428
+#: src/uicommon/gftpui.c:1561
 #, c-format
-#, fuzzy
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "KB j"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:40 src/gtk/gftp-gtk.c:199 src/gtk/gftp-gtk.c:1014
-#: src/gtk/misc-gtk.c:478 src/gtk/misc-gtk.c:486
-#, c-format
-#, fuzzy
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
+#, fuzzy, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "ndalo i pari j"
 
@@ -1959,12 +1959,10 @@ msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Shto Libërshënues Ti shkruaj a emri për j"
 
 #: src/gtk/bookmarks.c:78
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "Shto Libërshënues shto emri ekziston j"
 
-#. GRUT modified this item
 #: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Shto libërshënues"
@@ -1982,1068 +1980,1005 @@ msgid ""
 "(ex: Linux Sites/Debian)"
 msgstr "Shto emri nga shto elementët nga a a j Linux Site"
 
-#. GRUT modified this item
 #: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Kujto fjalëkalimin"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:474 src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Shto Libërshënues Ti shkruaj a emri për j"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Kartelë e Re"
 
-#: src/gtk/bookmarks.c:475
+#: src/gtk/bookmarks.c:464
 #, fuzzy
 msgid "Enter the name of the new folder to create"
 msgstr "Shto emri nga i ri kartelë"
 
-#: src/gtk/bookmarks.c:485
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "File E re."
+
+#: src/gtk/bookmarks.c:474
 #, fuzzy
 msgid "Enter the name of the new item to create"
 msgstr "Shto emri nga i ri element"
 
-#: src/gtk/bookmarks.c:558
-#, c-format
-#, fuzzy
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr "j dhe?"
 
-#: src/gtk/bookmarks.c:559
+#: src/gtk/bookmarks.c:548
 #, fuzzy
 msgid "Delete Bookmark"
 msgstr "Elemino Libërshënues"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:586
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Libërshënues"
 
-#: src/gtk/bookmarks.c:847 src/gtk/bookmarks.c:850
+#: src/gtk/bookmarks.c:825
 #, fuzzy
 msgid "Edit Entry"
 msgstr "Ndrysho"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Përshkrimi:"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Emri i host:"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Porta:"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokolli:"
 
-#: src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 #, fuzzy
 msgid "Remote Directory:"
 msgstr "Në distancë Directory:"
 
-#: src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 #, fuzzy
 msgid "Local Directory:"
 msgstr "Lokale Directory:"
 
-#. GRUT modified this item
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Përdoruesi:"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:1000 src/text/textui.c:82
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Fjalëkalimi:"
 
-#: src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 #, fuzzy
 msgid "Account:"
 msgstr "Llogaria:"
 
-#: src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 #, fuzzy
 msgid "Log in as ANONYMOUS"
 msgstr "Log në"
 
-#: src/gtk/bookmarks.c:1053 src/gtk/bookmarks.c:1307
-#: src/gtk/chmod_dialog.c:272 src/gtk/gtkui_transfer.c:373
-#: src/gtk/options_dialog.c:1118 src/gtk/options_dialog.c:1320
-#, fuzzy
-msgid "  Cancel  "
-msgstr "Anullo "
-
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:1063 src/gtk/options_dialog.c:1331
-msgid "Apply"
-msgstr "Apliko"
-
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:1213
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_File"
 
-#: src/gtk/bookmarks.c:1214
+#: src/gtk/bookmarks.c:1155
 #, fuzzy
 msgid "/File/tearoff"
 msgstr "File"
 
-#: src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1156
 #, fuzzy
-msgid "/File/New Folder..."
+msgid "/File/New _Folder..."
 msgstr "File E re Kartelë."
 
-#: src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1157
 #, fuzzy
-msgid "/File/New Item..."
+msgid "/File/New _Item..."
 msgstr "File E re."
 
-#: src/gtk/bookmarks.c:1217
+#: src/gtk/bookmarks.c:1158
 #, fuzzy
-msgid "/File/Delete"
+msgid "/File/_Delete"
 msgstr "File Elemino"
 
-#: src/gtk/bookmarks.c:1218
+#: src/gtk/bookmarks.c:1159
 #, fuzzy
-msgid "/File/Properties..."
+msgid "/File/_Properties..."
 msgstr "File Pronësitë."
 
-#: src/gtk/bookmarks.c:1219
+#: src/gtk/bookmarks.c:1160
 #, fuzzy
 msgid "/File/sep"
 msgstr "File"
 
-#: src/gtk/bookmarks.c:1220
+#: src/gtk/bookmarks.c:1161
 #, fuzzy
-msgid "/File/Close"
+msgid "/File/_Close"
 msgstr "File Mbyll"
 
-#. GRUT modified this item
-#: src/gtk/bookmarks.c:1238 src/gtk/bookmarks.c:1241
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Ndrysho libërshënuesit"
 
-#: src/gtk/chmod_dialog.c:139 src/gtk/chmod_dialog.c:144
-#: src/gtk/chmod_dialog.c:149
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:169
+#: src/gtk/chmod_dialog.c:152
 #, fuzzy
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
 msgstr "Ti tani nga Not karakteristika"
 
-#. GRUT modified this item
-#: src/gtk/chmod_dialog.c:179
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Speciale"
 
-#: src/gtk/chmod_dialog.c:187
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:191
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:195
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#. GRUT modified this item
-#: src/gtk/chmod_dialog.c:199 src/gtk/gftp-gtk.c:698
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Përdoruesi"
 
-#. GRUT modified this item
-#: src/gtk/chmod_dialog.c:207 src/gtk/chmod_dialog.c:227
-#: src/gtk/chmod_dialog.c:247
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Lexo"
 
-#. GRUT modified this item
-#. GRUT modified this item
-#: src/gtk/chmod_dialog.c:211 src/gtk/chmod_dialog.c:231
-#: src/gtk/chmod_dialog.c:251
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Shkrim"
 
-#. GRUT modified this item
-#: src/gtk/chmod_dialog.c:215 src/gtk/chmod_dialog.c:235
-#: src/gtk/chmod_dialog.c:255
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Ekzekuto"
 
-#: src/gtk/chmod_dialog.c:219 src/gtk/gftp-gtk.c:699
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 #, fuzzy
 msgid "Group"
 msgstr "Grupi"
 
-#: src/gtk/chmod_dialog.c:239
+#: src/gtk/chmod_dialog.c:222
 #, fuzzy
 msgid "Other"
 msgstr "Tjetër"
 
-#: src/gtk/delete_dialog.c:156
-#, c-format
-#, fuzzy
+#: src/gtk/delete_dialog.c:61
+#, fuzzy, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "elemino dhe"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "elemino dhe"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "elemino dhe"
+
+#: src/gtk/delete_dialog.c:74
 #, fuzzy
 msgid "Delete Files/Directories"
 msgstr "Elemino Files Directories"
 
-#. GRUT modified this item
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1192
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Elemino"
 
-#: src/gtk/dnd.c:128 src/gtk/dnd.c:260
-#, c-format
-#, fuzzy
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Lidhu"
+
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
+#, fuzzy, c-format
 msgid "Received URL %s\n"
 msgstr "Marrë URL j"
 
-#: src/gtk/dnd.c:151 src/gtk/dnd.c:238
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 #, fuzzy
 msgid "Drag-N-Drop"
 msgstr "N Hidh"
 
-#. GRUT modified this item
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:112
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Dalja"
 
-#: src/gtk/gftp-gtk.c:112
+#: src/gtk/gftp-gtk.c:142
 #, fuzzy
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
 msgstr "në?"
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 #, fuzzy
-msgid "Connect via URL"
-msgstr "Lidhu URL"
+msgid "Open Location"
+msgstr "Mundësitë"
 
-#: src/gtk/gftp-gtk.c:184
+#: src/gtk/gftp-gtk.c:217
 #, fuzzy
 msgid "Enter a URL to connect to"
 msgstr "Shto a URL"
 
-#: src/gtk/gftp-gtk.c:200
-msgid "OpenURL"
-msgstr ""
-
-#: src/gtk/gftp-gtk.c:223
+#: src/gtk/gftp-gtk.c:263
 #, fuzzy
 msgid "/_FTP"
 msgstr "FTP"
 
-#: src/gtk/gftp-gtk.c:224
+#: src/gtk/gftp-gtk.c:264
 #, fuzzy
 msgid "/FTP/tearoff"
 msgstr "FTP"
 
-#: src/gtk/gftp-gtk.c:225
+#: src/gtk/gftp-gtk.c:265
 #, fuzzy
-msgid "/FTP/Window 1"
+msgid "/FTP/Window _1"
 msgstr "FTP Dritarja"
 
-#: src/gtk/gftp-gtk.c:226
+#: src/gtk/gftp-gtk.c:267
 #, fuzzy
-msgid "/FTP/Window 2"
+msgid "/FTP/Window _2"
 msgstr "FTP Dritarja 2"
 
-#: src/gtk/gftp-gtk.c:227 src/gtk/gftp-gtk.c:230 src/gtk/gftp-gtk.c:233
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 #, fuzzy
 msgid "/FTP/sep"
 msgstr "FTP"
 
-#: src/gtk/gftp-gtk.c:228
+#: src/gtk/gftp-gtk.c:270
 #, fuzzy
-msgid "/FTP/Ascii"
+msgid "/FTP/_Ascii"
 msgstr "FTP"
 
-#: src/gtk/gftp-gtk.c:229
+#: src/gtk/gftp-gtk.c:272
 #, fuzzy
-msgid "/FTP/Binary"
+msgid "/FTP/_Binary"
 msgstr "FTP Binar"
 
-#: src/gtk/gftp-gtk.c:231
+#: src/gtk/gftp-gtk.c:275
 #, fuzzy
-msgid "/FTP/_Options..."
-msgstr "FTP Mundësitë."
+msgid "/FTP/_Preferences..."
+msgstr "File Pronësitë."
 
-#: src/gtk/gftp-gtk.c:234
+#: src/gtk/gftp-gtk.c:278
 #, fuzzy
 msgid "/FTP/_Quit"
 msgstr "FTP Dalja"
 
-#: src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:279
 #, fuzzy
 msgid "/_Local"
 msgstr "Lokale"
 
-#: src/gtk/gftp-gtk.c:236
+#: src/gtk/gftp-gtk.c:280
 #, fuzzy
 msgid "/Local/tearoff"
 msgstr "Lokale"
 
-#: src/gtk/gftp-gtk.c:237
+#: src/gtk/gftp-gtk.c:281
 #, fuzzy
-msgid "/Local/Open _URL..."
+msgid "/Local/_Open Location..."
 msgstr "Lokale Hap URL."
 
-#: src/gtk/gftp-gtk.c:238
+#: src/gtk/gftp-gtk.c:283
 #, fuzzy
-msgid "/Local/Disconnect"
+msgid "/Local/D_isconnect"
 msgstr "Lokale Shkëputu"
 
-#: src/gtk/gftp-gtk.c:239 src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 #, fuzzy
 msgid "/Local/sep"
 msgstr "Lokale"
 
-#: src/gtk/gftp-gtk.c:240
+#: src/gtk/gftp-gtk.c:285
 #, fuzzy
-msgid "/Local/Change Filespec..."
+msgid "/Local/Change _Filespec..."
 msgstr "Lokale Ndrysho."
 
-#: src/gtk/gftp-gtk.c:241
+#: src/gtk/gftp-gtk.c:287
 #, fuzzy
-msgid "/Local/Show selected"
+msgid "/Local/_Show selected"
 msgstr "Lokale Shfaq"
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:288
 #, fuzzy
-msgid "/Local/Select All"
+msgid "/Local/Select _All"
 msgstr "Lokale Zgjidh Gjithçka"
 
-#: src/gtk/gftp-gtk.c:243
+#: src/gtk/gftp-gtk.c:289
 #, fuzzy
 msgid "/Local/Select All Files"
 msgstr "Lokale Zgjidh Gjithçka Files"
 
-#: src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:290
 #, fuzzy
 msgid "/Local/Deselect All"
 msgstr "Lokale Gjithçka"
 
-#: src/gtk/gftp-gtk.c:246
+#: src/gtk/gftp-gtk.c:292
 #, fuzzy
 msgid "/Local/Save Directory Listing..."
 msgstr "Lokale Ruaj Directory."
 
-#: src/gtk/gftp-gtk.c:247
+#: src/gtk/gftp-gtk.c:293
 #, fuzzy
 msgid "/Local/Send SITE Command..."
 msgstr "Lokale Dërgo Komanda."
 
-#: src/gtk/gftp-gtk.c:248
+#: src/gtk/gftp-gtk.c:294
 #, fuzzy
-msgid "/Local/Change Directory"
+msgid "/Local/_Change Directory"
 msgstr "Lokale Ndrysho Directory"
 
-#: src/gtk/gftp-gtk.c:249
+#: src/gtk/gftp-gtk.c:295
 #, fuzzy
-msgid "/Local/Chmod..."
+msgid "/Local/_Permissions..."
 msgstr "Lokale."
 
-#: src/gtk/gftp-gtk.c:250
+#: src/gtk/gftp-gtk.c:297
 #, fuzzy
-msgid "/Local/Make Directory..."
-msgstr "Lokale Directory."
+msgid "/Local/_New Folder..."
+msgstr "File E re Kartelë."
 
-#: src/gtk/gftp-gtk.c:251
+#: src/gtk/gftp-gtk.c:298
 #, fuzzy
-msgid "/Local/Rename..."
+msgid "/Local/Rena_me..."
 msgstr "Lokale Riemërto."
 
-#: src/gtk/gftp-gtk.c:252
+#: src/gtk/gftp-gtk.c:300
 #, fuzzy
-msgid "/Local/Delete..."
+msgid "/Local/_Delete..."
 msgstr "Lokale Elemino."
 
-#: src/gtk/gftp-gtk.c:253
+#: src/gtk/gftp-gtk.c:302
 #, fuzzy
-msgid "/Local/Edit..."
+msgid "/Local/_Edit..."
 msgstr "Lokale Ndrysho."
 
-#: src/gtk/gftp-gtk.c:254
+#: src/gtk/gftp-gtk.c:303
 #, fuzzy
-msgid "/Local/View..."
+msgid "/Local/_View..."
 msgstr "Lokale Paraqitja."
 
-#: src/gtk/gftp-gtk.c:255
+#: src/gtk/gftp-gtk.c:304
 #, fuzzy
-msgid "/Local/Refresh"
+msgid "/Local/_Refresh"
 msgstr "Lokale Rifresko"
 
-#: src/gtk/gftp-gtk.c:256
+#: src/gtk/gftp-gtk.c:306
 #, fuzzy
 msgid "/_Remote"
 msgstr "Në distancë"
 
-#: src/gtk/gftp-gtk.c:257
+#: src/gtk/gftp-gtk.c:307
 #, fuzzy
 msgid "/Remote/tearoff"
 msgstr "Në distancë"
 
-#: src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:308
 #, fuzzy
-msgid "/Remote/Open _URL..."
+msgid "/Remote/_Open Location..."
 msgstr "Në distancë Hap URL."
 
-#: src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:310
 #, fuzzy
-msgid "/Remote/Disconnect"
+msgid "/Remote/D_isconnect"
 msgstr "Në distancë Shkëputu"
 
-#: src/gtk/gftp-gtk.c:262 src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 #, fuzzy
 msgid "/Remote/sep"
 msgstr "Në distancë"
 
-#: src/gtk/gftp-gtk.c:263
+#: src/gtk/gftp-gtk.c:313
 #, fuzzy
-msgid "/Remote/Change Filespec..."
+msgid "/Remote/Change _Filespec..."
 msgstr "Në distancë Ndrysho."
 
-#: src/gtk/gftp-gtk.c:264
+#: src/gtk/gftp-gtk.c:315
 #, fuzzy
-msgid "/Remote/Show selected"
+msgid "/Remote/_Show selected"
 msgstr "Në distancë Shfaq"
 
-#: src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:316
 #, fuzzy
-msgid "/Remote/Select All"
+msgid "/Remote/Select _All"
 msgstr "Në distancë Zgjidh Gjithçka"
 
-#: src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:317
 #, fuzzy
 msgid "/Remote/Select All Files"
 msgstr "Në distancë Zgjidh Gjithçka Files"
 
-#: src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:318
 #, fuzzy
 msgid "/Remote/Deselect All"
 msgstr "Në distancë Gjithçka"
 
-#: src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:320
 #, fuzzy
 msgid "/Remote/Save Directory Listing..."
 msgstr "Në distancë Ruaj Directory."
 
-#: src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:321
 #, fuzzy
 msgid "/Remote/Send SITE Command..."
 msgstr "Në distancë Dërgo Komanda."
 
-#: src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:322
 #, fuzzy
-msgid "/Remote/Change Directory"
+msgid "/Remote/_Change Directory"
 msgstr "Në distancë Ndrysho Directory"
 
-#: src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:323
 #, fuzzy
-msgid "/Remote/Chmod..."
+msgid "/Remote/_Permisssions..."
 msgstr "Në distancë."
 
-#: src/gtk/gftp-gtk.c:273
+#: src/gtk/gftp-gtk.c:324
 #, fuzzy
-msgid "/Remote/Make Directory..."
-msgstr "Në distancë Directory."
+msgid "/Remote/_New Folder..."
+msgstr "File E re Kartelë."
 
-#: src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:326
 #, fuzzy
-msgid "/Remote/Rename..."
+msgid "/Remote/Rena_me..."
 msgstr "Në distancë Riemërto."
 
-#: src/gtk/gftp-gtk.c:275
+#: src/gtk/gftp-gtk.c:328
 #, fuzzy
-msgid "/Remote/Delete..."
+msgid "/Remote/_Delete..."
 msgstr "Në distancë Elemino."
 
-#: src/gtk/gftp-gtk.c:276
+#: src/gtk/gftp-gtk.c:329
 #, fuzzy
-msgid "/Remote/Edit..."
+msgid "/Remote/_Edit..."
 msgstr "Në distancë Ndrysho."
 
-#: src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:330
 #, fuzzy
-msgid "/Remote/View..."
+msgid "/Remote/_View..."
 msgstr "Në distancë Paraqitja."
 
-#: src/gtk/gftp-gtk.c:278
+#: src/gtk/gftp-gtk.c:331
 #, fuzzy
-msgid "/Remote/Refresh"
+msgid "/Remote/_Refresh"
 msgstr "Në distancë Rifresko"
 
-#: src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:333
 #, fuzzy
 msgid "/_Bookmarks"
 msgstr "Libërshënues"
 
-#: src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:334
 #, fuzzy
 msgid "/Bookmarks/tearoff"
 msgstr "Libërshënues"
 
-#: src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:335
 #, fuzzy
-msgid "/Bookmarks/Add bookmark"
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "Libërshënues Shto"
 
-#: src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:337
 #, fuzzy
-msgid "/Bookmarks/Edit bookmarks"
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "Libërshënues Ndrysho"
 
-#: src/gtk/gftp-gtk.c:284
+#: src/gtk/gftp-gtk.c:338
 #, fuzzy
 msgid "/Bookmarks/sep"
 msgstr "Libërshënues"
 
-#: src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:339
 #, fuzzy
-msgid "/_Transfers"
+msgid "/_Transfer"
 msgstr "Transferime"
 
-#: src/gtk/gftp-gtk.c:286
+#: src/gtk/gftp-gtk.c:340
 #, fuzzy
-msgid "/Transfers/tearoff"
+msgid "/Transfer/tearoff"
 msgstr "Transferime"
 
-#: src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:341
 #, fuzzy
-msgid "/Transfers/Start Transfer"
-msgstr "Transferime Fillo Transferimi"
+msgid "/Transfer/_Start"
+msgstr "Transferime"
 
-#: src/gtk/gftp-gtk.c:288
+#: src/gtk/gftp-gtk.c:342
 #, fuzzy
-msgid "/Transfers/Stop Transfer"
-msgstr "Transferime Ndal Transferimi"
+msgid "/Transfer/St_op"
+msgstr "Transferime"
 
-#: src/gtk/gftp-gtk.c:290 src/gtk/gftp-gtk.c:298
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 #, fuzzy
-msgid "/Transfers/sep"
+msgid "/Transfer/sep"
 msgstr "Transferime"
 
-#: src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:345
 #, fuzzy
-msgid "/Transfers/Skip Current File"
+msgid "/Transfer/Skip _Current File"
 msgstr "Transferime Kapërce Aktual File"
 
-#: src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:346
 #, fuzzy
-msgid "/Transfers/Remove File"
+msgid "/Transfer/_Remove File"
 msgstr "Transferime Hiq File"
 
-#: src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:348
 #, fuzzy
-msgid "/Transfers/Move File _Up"
+msgid "/Transfer/Move File _Up"
 msgstr "Transferime Lëvize File Sipër"
 
-#: src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:350
 #, fuzzy
-msgid "/Transfers/Move File _Down"
+msgid "/Transfer/Move File _Down"
 msgstr "Transferime Lëvize File Poshtë"
 
-#: src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:353
 #, fuzzy
-msgid "/Transfers/Retrieve Files"
+msgid "/Transfer/_Retrieve Files"
 msgstr "Transferime Files"
 
-#: src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:354
 #, fuzzy
-msgid "/Transfers/Put Files"
+msgid "/Transfer/_Put Files"
 msgstr "Transferime Files"
 
-#: src/gtk/gftp-gtk.c:301
+#: src/gtk/gftp-gtk.c:355
 #, fuzzy
-msgid "/L_ogging"
+msgid "/L_og"
 msgstr "L"
 
-#: src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:356
 #, fuzzy
-msgid "/Logging/tearoff"
+msgid "/Log/tearoff"
 msgstr "Hyrje"
 
-#: src/gtk/gftp-gtk.c:303
+#: src/gtk/gftp-gtk.c:357
 #, fuzzy
-msgid "/Logging/Clear"
+msgid "/Log/_Clear"
 msgstr "Hyrje Pastro"
 
-#: src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:358
 #, fuzzy
-msgid "/Logging/View log..."
-msgstr "Hyrje Paraqitja."
+msgid "/Log/_View"
+msgstr "Lokale Paraqitja."
 
-#: src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:359
 #, fuzzy
-msgid "/Logging/Save log..."
+msgid "/Log/_Save..."
 msgstr "Hyrje Ruaj."
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:307
+#: src/gtk/gftp-gtk.c:361
 #, fuzzy
 msgid "/Tools/tearoff"
 msgstr "Veglat"
 
-#: src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:362
 #, fuzzy
-msgid "/Tools/Compare Windows"
+msgid "/Tools/C_ompare Windows"
 msgstr "Veglat Krahaso Dritaret"
 
-#: src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:363
 #, fuzzy
-msgid "/Tools/Clear Cache"
+msgid "/Tools/_Clear Cache"
 msgstr "Veglat Pastro Cache"
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:310
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Ndihmë"
 
-#: src/gtk/gftp-gtk.c:311
+#: src/gtk/gftp-gtk.c:365
 #, fuzzy
 msgid "/Help/tearoff"
 msgstr "Ndihmë"
 
-#: src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:366
 #, fuzzy
-msgid "/Help/About..."
+msgid "/Help/_About"
 msgstr "Informacione."
 
-#: src/gtk/gftp-gtk.c:430
+#: src/gtk/gftp-gtk.c:485
 #, fuzzy
-msgid "Host: "
+msgid "_Host: "
 msgstr "Host "
 
-#: src/gtk/gftp-gtk.c:448
+#: src/gtk/gftp-gtk.c:508
 #, fuzzy
 msgid "Port: "
 msgstr "Porta "
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:466
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Përdoruesi:"
 
-#: src/gtk/gftp-gtk.c:484
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:553
+#: src/gtk/gftp-gtk.c:618
 #, fuzzy
 msgid "Command: "
 msgstr "Komanda "
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:696 src/gtk/gftp-gtk.c:903 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Emri i file"
 
-#: src/gtk/gftp-gtk.c:697
+#: src/gtk/gftp-gtk.c:770
 #, fuzzy
 msgid "Size"
 msgstr "Madhësia"
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:700
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Data"
 
-#: src/gtk/gftp-gtk.c:701
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr ""
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:904
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progresi"
 
-#. GRUT modified this item
-#: src/gtk/gftp-gtk.c:1015 src/gtk/misc-gtk.c:905 src/gtk/misc-gtk.c:979
-msgid "Connect"
-msgstr "Lidhu"
-
-#: src/gtk/gftp-gtk.c:1045
+#: src/gtk/gftp-gtk.c:1086
 #, fuzzy
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Gabim Ti lloji në a j"
 
-#. GRUT modified this item
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Rifresko"
 
-#: src/gtk/gtkui.c:93
+#: src/gtk/gtkui.c:120
 #, fuzzy
 msgid "Enter Username"
 msgstr "Shto Përdoruesi"
 
-#: src/gtk/gtkui.c:94
+#: src/gtk/gtkui.c:121
 #, fuzzy
 msgid "Please enter your username for this site"
 msgstr "shkruaj përdoruesi për siti"
 
-#. GRUT modified this item
-#: src/gtk/gtkui.c:115 src/gtk/transfer.c:508 src/gtk/transfer.c:519
-msgid "Enter Password"
-msgstr "Shkruaj fjalëkalimin"
-
-#: src/gtk/gtkui.c:116 src/gtk/transfer.c:509 src/gtk/transfer.c:520
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 #, fuzzy
 msgid "Please enter your password for this site"
 msgstr "shkruaj password për siti"
 
-#: src/gtk/gtkui.c:272
+#: src/gtk/gtkui.c:286
 #, fuzzy
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Veprimi shkruaj a j"
 
-#: src/gtk/gtkui.c:310
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr ""
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 #, fuzzy
 msgid "Make Directory"
 msgstr "Directory"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 #, fuzzy
 msgid "Enter name of directory to create"
 msgstr "Shto emri nga"
 
-#. GRUT modified this item
-#: src/gtk/gtkui.c:336 src/gtk/gtkui.c:348 src/gtk/misc-gtk.c:908
-#: src/gtk/misc-gtk.c:982
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Riemërto"
 
-#: src/gtk/gtkui.c:346
-#, c-format
-#, fuzzy
+#: src/gtk/gtkui.c:368
+#, fuzzy, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Çfarë?"
 
-#: src/gtk/gtkui.c:368 src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr ""
 
-#: src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:393
 #, fuzzy
 msgid "Enter site-specific command"
 msgstr "Shto siti"
 
-#: src/gtk/gtkui.c:414 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr ""
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr ""
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:403 src/gtk/transfer.c:486
-#: src/gtk/transfer.c:965
+#: 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:465 src/gtk/transfer.c:490
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 #, fuzzy
 msgid "Waiting..."
 msgstr "Në pritje."
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:299
-#: src/gtk/gtkui_transfer.c:326
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Mbishkruaj"
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:305
-#: src/gtk/gtkui_transfer.c:332
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Vazhdo"
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:302
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Kapërce"
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Veprimi"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:92
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 #, fuzzy
 msgid "Transfer Files"
 msgstr "Transferimi Files"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 #, fuzzy
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr "në lokal dhe në distancë zgjidh"
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:308
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Gabim"
 
-#: src/gtk/gtkui_transfer.c:338
+#: src/gtk/gtkui_transfer.c:333
 #, fuzzy
 msgid "Skip File"
 msgstr "Kapërce File"
 
-#. GRUT modified this item
-#: src/gtk/gtkui_transfer.c:348
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Zgjidh gjithçka"
 
-#: src/gtk/gtkui_transfer.c:354
+#: src/gtk/gtkui_transfer.c:349
 #, fuzzy
 msgid "Deselect All"
 msgstr "Gjithçka"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 #, fuzzy
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Ndrysho Veprimi shkruaj a j"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 #, fuzzy
 msgid "Change Filespec"
 msgstr "Ndrysho"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 #, fuzzy
 msgid "Enter the new file specification"
 msgstr "Shto i ri"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:373
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:155
-#, c-format
-#, fuzzy
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
+#, fuzzy, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Gabim hap për j"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 #, fuzzy
 msgid "Save Directory Listing"
 msgstr "Ruaj Directory"
 
-#: src/gtk/menu-items.c:337 src/gtk/menu-items.c:397
-#, c-format
-#, fuzzy
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
+#, fuzzy, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Gabim Gabim j"
 
-#: src/gtk/menu-items.c:408
-#, c-format
-#, fuzzy
+#: src/gtk/menu-items.c:382
+#, fuzzy, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "j"
 
-#: src/gtk/menu-items.c:420
+#: src/gtk/menu-items.c:394
 #, fuzzy
 msgid "Save Log"
 msgstr "Ruaj Log"
 
-#: src/gtk/menu-items.c:456
-#, c-format
-#, fuzzy
+#: src/gtk/menu-items.c:428
+#, fuzzy, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "gjej liçenca është në në"
 
-#: src/gtk/menu-items.c:460 src/gtk/menu-items.c:465
+#: src/gtk/menu-items.c:430
 #, fuzzy
 msgid "About gFTP"
 msgstr "Informacione gFTP"
 
-#: src/gtk/menu-items.c:496
-#, c-format
-#, fuzzy
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr "C<masneyb gftp org>http://www.gftp.org/ nga<planet_hoth yahoo com> j"
 
-#. GRUT modified this item
-#: src/gtk/menu-items.c:508
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Informacione"
 
-#: src/gtk/menu-items.c:557
+#: src/gtk/menu-items.c:506
 #, fuzzy
 msgid "License Agreement"
 msgstr "Liçenca"
 
-#: src/gtk/menu-items.c:563 src/gtk/view_dialog.c:404
-#, fuzzy
-msgid "  Close  "
-msgstr "Mbyll "
-
-#: src/gtk/menu-items.c:647
+#: src/gtk/menu-items.c:613
 #, fuzzy
 msgid "Compare Windows"
 msgstr "Krahaso Dritaret"
 
-#. GRUT modified this item
-#: src/gtk/misc-gtk.c:287
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "në distancë siti"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Të gjithë files"
 
-#: src/gtk/misc-gtk.c:294
+#: src/gtk/misc-gtk.c:270
 #, fuzzy
 msgid "] (Cached) ["
 msgstr "Në cache"
 
-#. GRUT modified this item
-#: src/gtk/misc-gtk.c:319
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Jo i lidhur"
 
-#: src/gtk/misc-gtk.c:405
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:383
+#, fuzzy, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Gabim j"
 
-#: src/gtk/misc-gtk.c:494
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:468
+#, fuzzy, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "Not a në distancë siti j"
 
-#: src/gtk/misc-gtk.c:501
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:475
+#, fuzzy, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "karakteristika është nuk j"
 
-#: src/gtk/misc-gtk.c:509
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:483
+#, fuzzy, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "Ti element j"
 
-#: src/gtk/misc-gtk.c:516
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:490
+#, fuzzy, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "Ti element j"
 
-#. GRUT modified this item
-#: src/gtk/misc-gtk.c:902 src/gtk/misc-gtk.c:976
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Ndrysho"
 
-#: src/gtk/misc-gtk.c:973 src/gtk/options_dialog.c:1178
-#, fuzzy
-msgid "Add"
-msgstr "Shto"
-
-#. GRUT modified this item
-#. GRUT modified this item
-#: src/gtk/misc-gtk.c:999
-msgid "Cancel"
-msgstr "Anullo"
-
-#: src/gtk/misc-gtk.c:1069
-#, fuzzy
-msgid "  Yes  "
-msgstr "Po "
-
-#: src/gtk/misc-gtk.c:1079
-#, fuzzy
-msgid "  No  "
-msgstr "Jo "
-
-#: src/gtk/misc-gtk.c:1139
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr ""
 
-#: src/gtk/misc-gtk.c:1159
+#: src/gtk/misc-gtk.c:993
 #, fuzzy
 msgid "  Stop  "
 msgstr "Ndal "
 
-#: src/gtk/misc-gtk.c:1169
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:1003
+#, fuzzy, c-format
 msgid ""
 "Received %ld directories\n"
 "and %ld files"
 msgstr "Marrë"
 
-#: src/gtk/misc-gtk.c:1245
-#, c-format
-#, fuzzy
+#: src/gtk/misc-gtk.c:1079
+#, fuzzy, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Gabim gjej në j"
 
-#: src/gtk/options_dialog.c:918
+#: src/gtk/options_dialog.c:907
 #, fuzzy
 msgid "Edit Host"
 msgstr "Ndrysho"
 
-#: src/gtk/options_dialog.c:918
+#: src/gtk/options_dialog.c:907
 #, fuzzy
 msgid "Add Host"
 msgstr "Shto"
 
-#. GRUT modified this item
-#: src/gtk/options_dialog.c:950 src/gtk/options_dialog.c:1041
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domain"
 
-#: src/gtk/options_dialog.c:970
+#: src/gtk/options_dialog.c:978
 #, fuzzy
-msgid "Network Address"
+msgid "_Network address:"
 msgstr "Rrjeti Adresa"
 
-#. GRUT modified this item
-#: src/gtk/options_dialog.c:1003 src/gtk/options_dialog.c:1143
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Netmask"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Domain"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Netmask"
 
-#: src/gtk/options_dialog.c:1149
+#: src/gtk/options_dialog.c:1139
 #, fuzzy
 msgid "Local Hosts"
 msgstr "Lokale"
 
-#. GRUT modified this item
-#: src/gtk/options_dialog.c:1185 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Ndrysho"
-
-#. GRUT modified this item
-#: src/gtk/options_dialog.c:1247 src/gtk/options_dialog.c:1252
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Mundësitë"
 
@@ -3052,175 +2987,268 @@ msgstr "Mundësitë"
 msgid "Receiving file names..."
 msgstr "Duke marrë."
 
-#. GRUT modified this item
-#: src/gtk/transfer.c:62 src/gtk/transfer.c:639
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Duke u lidhur..."
 
-#: src/gtk/transfer.c:100
+#: src/gtk/transfer.c:99
 #, fuzzy
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Files Not a në distancë siti j"
 
-#: src/gtk/transfer.c:315
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:336
+#, fuzzy, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Gabim Bir j"
 
-#: src/gtk/transfer.c:318
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:345
+#, fuzzy, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Bir j"
 
-#: src/gtk/transfer.c:325
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Gabim Bir j"
+
+#: src/gtk/transfer.c:368
+#, fuzzy, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Gabim merr informacione j"
 
-#: src/gtk/transfer.c:330
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:374
+#, fuzzy, c-format
 msgid "File %s was not changed\n"
 msgstr "File nuk j"
 
-#: src/gtk/transfer.c:338
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:382
+#, fuzzy, c-format
 msgid ""
 "File %s has changed.\n"
 "Would you like to upload it?"
 msgstr "File?"
 
-#: src/gtk/transfer.c:341
+#: src/gtk/transfer.c:385
 #, fuzzy
 msgid "Edit File"
 msgstr "Ndrysho File"
 
-#: src/gtk/transfer.c:406
+#: src/gtk/transfer.c:476
 #, fuzzy
 msgid "Finished"
 msgstr "Përfundoi"
 
-#: src/gtk/transfer.c:446
-#, c-format
-#, fuzzy
-msgid "Stopping the transfer of %s\n"
-msgstr "nga j"
-
-#: src/gtk/transfer.c:684
-#, c-format
-#, fuzzy
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "ora File nga"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "nga ora"
 
-#: src/gtk/transfer.c:714
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:739
+#, fuzzy, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "nga ora"
 
-#: src/gtk/transfer.c:723
-#, c-format
-#, fuzzy
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "nga nuk njihet ora"
+
+#: src/gtk/transfer.c:756
+#, fuzzy, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "nga nuk njihet ora"
 
-#: src/gtk/transfer.c:758
+#: src/gtk/transfer.c:800
 #, c-format
-#, fuzzy
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
+
+#: src/gtk/transfer.c:804
+#, fuzzy, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr "ora File nga"
+
+#: src/gtk/transfer.c:842
+#, fuzzy, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "bytes"
 
-#: src/gtk/transfer.c:837 src/gtk/transfer.c:859 src/gtk/transfer.c:893
-#: src/gtk/transfer.c:933 src/gtk/transfer.c:986 src/gtk/transfer.c:1046
+#: 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
 #, fuzzy
 msgid "There are no file transfers selected\n"
 msgstr "jo j"
 
-#: src/gtk/transfer.c:877
-#, c-format
-#, fuzzy
-msgid "Stopping the transfer on host %s\n"
-msgstr "në j"
-
-#: src/gtk/transfer.c:918 src/gtk/transfer.c:971
-#, c-format
-#, fuzzy
-msgid "Skipping file %s on host %s\n"
-msgstr "në j"
-
-#: src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 #, fuzzy
 msgid "View"
 msgstr "Paraqitja"
 
-#: src/gtk/view_dialog.c:48
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Ndrysho"
+
+#: src/gtk/view_dialog.c:49
+#, fuzzy, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Paraqitja është a shfaq j"
 
-#: src/gtk/view_dialog.c:114
-#, fuzzy
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Ndrysho Ti në dialog j"
-
-#: src/gtk/view_dialog.c:127
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:52
+#, fuzzy, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Ndrysho është a ndrysho j"
 
-#: src/gtk/view_dialog.c:210
-#, c-format
+#: src/gtk/view_dialog.c:123
 #, fuzzy
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "Ndrysho Ti në dialog j"
+
+#: src/gtk/view_dialog.c:177
+#, fuzzy, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Paraqitja duplikim j"
 
-#: src/gtk/view_dialog.c:213
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:180
+#, fuzzy, c-format
 msgid "Running program: %s %s\n"
 msgstr "Në ekzekutim programi j"
 
-#: src/gtk/view_dialog.c:271
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:238
+#, fuzzy, c-format
 msgid "Opening %s with %s\n"
 msgstr "me j"
 
-#: src/gtk/view_dialog.c:306
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:280
+#, fuzzy, c-format
 msgid "Viewing file %s\n"
 msgstr "j"
 
-#: src/gtk/view_dialog.c:313
-#, c-format
-#, fuzzy
+#: src/gtk/view_dialog.c:287
+#, fuzzy, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Paraqitja hap j"
 
-#: src/text/gftp-text.c:169
-#, c-format
-#, fuzzy
+#: src/text/gftp-text.c:166
+#, fuzzy, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "hap terminal j"
 
-#: src/text/textui.c:70
+#: src/text/textui.c:80
 #, fuzzy
 msgid "Username [anonymous]:"
 msgstr "Përdoruesi:"
 
-#: src/text/textui.c:139
-#, c-format
-#, fuzzy
+#: src/text/textui.c:158
+#, fuzzy, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr "ekziston madhësia madhësia j O Gjithçka R Gjithçka S Gjithçka"
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#, fuzzy
+#~ msgid "Startup Directory:"
+#~ msgstr "Directory:"
+
+#, fuzzy
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "prezgjedhur gFTP në"
+
+#, fuzzy
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Duke filluar j"
+
+#, fuzzy
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "server shtegu:"
+
+#, fuzzy
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "E prezgjedhur në distancë server shtegu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr "Thirrje me është në distancë shtegu në distancë server"
+
+#~ msgid "WARNING"
+#~ msgstr "KUJDES"
+
+#, fuzzy
+#~ msgid "Please correct the above warning to connect to this host.\n"
+#~ msgstr "j"
+
+#, fuzzy
+#~ 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 ""
+#~ "çdo komente informacione programi Ti gjithmonë gjej informacione "
+#~ "gFTPhttp://www.gftp.org/ j"
+
+#, fuzzy
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr "Gabim Në distancë siti mbas j"
+
+#, fuzzy
+#~ msgid "  Cancel  "
+#~ msgstr "Anullo "
+
+#~ msgid "Apply"
+#~ msgstr "Apliko"
+
+#, fuzzy
+#~ msgid "Connect via URL"
+#~ msgstr "Lidhu URL"
+
+#, fuzzy
+#~ msgid "/FTP/_Options..."
+#~ msgstr "FTP Mundësitë."
+
+#, fuzzy
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "Lokale Directory."
+
+#, fuzzy
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "Në distancë Directory."
+
+#, fuzzy
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "Transferime Fillo Transferimi"
+
+#, fuzzy
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "Transferime Ndal Transferimi"
+
+#, fuzzy
+#~ msgid "/Logging/View log..."
+#~ msgstr "Hyrje Paraqitja."
+
+#, fuzzy
+#~ msgid "  Close  "
+#~ msgstr "Mbyll "
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Shto"
+
+#~ msgid "Cancel"
+#~ msgstr "Anullo"
+
+#, fuzzy
+#~ msgid "  Yes  "
+#~ msgstr "Po "
+
+#, fuzzy
+#~ msgid "  No  "
+#~ msgstr "Jo "
+
+#, fuzzy
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "nga j"
diff --git a/po/sr.po b/po/sr.po
index 8b02a0c..3705eda 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,16 +8,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-2.0.14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 17:53+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-03-01 17:53+0100\n"
 "Last-Translator: Страхиња Радић <mr99164 alas matf bg ac yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista nongnu org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Неисправан УРЛ %s\n"
@@ -27,68 +28,76 @@ msgstr "Неисправан УРЛ %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Грешка: Погрешан ред %s у датотеци индекса оставе\n"
 
-#: lib/cache.c:137 lib/local.c:534
+#: 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"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Грешка: Не могу да створим привремену датотеку: %s\n"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:265 lib/sshv2.c:1000
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Грешка приликом затварања описника датотеке: %s\n"
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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:117 lib/config_file.c:124 lib/protocols.c:2750
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Грешка: Не могу да отворим локалну датотеку %s: %s\n"
 
-#: lib/config_file.c:134 lib/protocols.c:2455 lib/sslcommon.c:467
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Грешка: Не могу да пишем у утичницу: %s\n"
 
-#: lib/config_file.c:142 lib/protocols.c:2383 lib/sslcommon.c:421
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Грешка: Не могу да читам са утичнице: %s\n"
 
-#: lib/config_file.c:174 lib/config_file.c:730
+#: 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"
 
-#: lib/config_file.c:183
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Упозорење: Не могу да пронађем главну датотеку са обележивачима %s\n"
 
-#: lib/config_file.c:194 lib/config_file.c:736
+#: 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"
 
-#: lib/config_file.c:286 lib/config_file.c:308
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Упозорење gFTP-а: Прескачем ред %d у датотеци са обележивачима: %s\n"
 
-#: lib/config_file.c:338
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Упозорење gFTP-а: Ред %d не садржи довољно параметара\n"
 
-#: lib/config_file.c:499
+#: 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 "
@@ -98,7 +107,7 @@ msgstr ""
 "посреднички сервер (ако је доступан). Синтакса: dont_use_proxy=.домен или "
 "dont_use_proxy=мрежни број/мрежнамаска"
 
-#: lib/config_file.c:502
+#: 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"
@@ -106,63 +115,64 @@ msgstr ""
 "ext=врста датотеке:XPM датотека:аски или бинарна (латинично „A“ или „B“):"
 "програм за преглед. Напомена: Сви аргументи осим врсте датотеке су необавезни"
 
-#: lib/config_file.c:580 lib/config_file.c:819
+#: 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:591
+#: 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:601
+#: 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:603
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Да ли сте инсталирали програм (make install)?\n"
 
-#: lib/config_file.c:612 lib/config_file.c:825
+#: 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:651
+#: 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:657
+#: 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:664
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Грешка gFTP-а: Неисправно име дневничке датотеке %s\n"
 
-#: lib/config_file.c:670
+#: 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:725
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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–2002 Брајан "
 "Месни (Brian Masney) <masneyb gftp org>. Упозорење: Сви коментари које "
 "додате овој датотеци ће бити обрисани"
 
-#: lib/config_file.c:726
+#: 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 "
@@ -174,9 +184,10 @@ msgstr ""
 "лако запамти вашу лозинку док уређујете ову датотеку. Пре овога, све лозинке "
 "су чуване као чист текст."
 
-#: lib/config_file.c:832
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -185,158 +196,208 @@ msgstr ""
 "ће бити обрисани. Ако унос садржи (*) у свом коментару, онда га не можете "
 "изменити из gFTP-а"
 
-#: lib/config_file.c:1196 lib/rfc2068.c:568 lib/rfc2068.c:569
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<непознат>"
 
-#: lib/config_file.c:1272 lib/config_file.c:1335 lib/config_file.c:1377
-#: lib/config_file.c:1410
+#: 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"
 
-#: lib/ftps.c:138
-msgid ""
-"FTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Подршка за FTPS није доступна пошто није присутна подршка за SSL. Прекидам "
-"повезивање.\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Грешка: Не могу да отворим локалну датотеку %s: %s\n"
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Подршка за HTTPS није доступна пошто није присутна подршка за SSL. Прекидам "
-"повезивање.\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Грешка: Не могу да претражим датотеку %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Не могу да променим локални директоријум у %s: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Грешка: Грешка приликом уписа у %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Не могу да сазнам тренутни директоријум: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "Не могу да прихватим повезивање са сервером: %s\n"
 
-#: lib/local.c:179
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Грешка: Не могу да скратим локалну датотеку %s: %s\n"
+#: 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 "непознато"
 
-#: lib/local.c:404
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Не могу да добавим списак локалних директоријума %s: %s\n"
 
-#: lib/local.c:441
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "Успешно промењен локални директоријум у %s\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:229
-#: src/gtk/view_dialog.c:316
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Не могу да променим локални директоријум у %s: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Успешно уклоњено %s\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Грешка: Не могу да уклоним директоријум %s: %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:233 src/gtk/view_dialog.c:320
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Грешка: Не могу да уклоним датотеку  %s: %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Успешно створен директоријум  %s\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Успешно преименовано  %s у %s\n"
 
-#: lib/local.c:560
+#: 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/local.c:583
+#: 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"
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "Успешно промењен режим %s у %d\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "Не могу да сазнам тренутни директоријум: %s\n"
+
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Успешно промењен локални директоријум у %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Не могу да променим локални директоријум у %s: %s\n"
+
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Грешка: Не могу да скратим локалну датотеку %s: %s\n"
 
-#: lib/local.c:590
+#: lib/local.c:424
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Не могу да добавим списак локалних директоријума %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Успешно промењен режим %s у %d\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
+msgstr "Грешка: Не могу да променим режим %s у %d: %s\n"
+
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Успешно промењен режим %s у %d\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Грешка: Не могу да променим режим %s у %d: %s\n"
 
-#: lib/local.c:682
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "локални систем датотека"
 
-#: lib/misc.c:415
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "употреба: gftp "
 
-#: lib/misc.c:415 src/uicommon/gftpui.c:616
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ниједан"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "датотека"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "величина"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "корисник"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "група"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "датум и време"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "атрибути"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "опадајуће"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "растуће"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Опште"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Програм за преглед:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -344,36 +405,28 @@ msgstr ""
 "Подразумевани програм за преглед датотека. Ако ово оставите празно, биће "
 "коришћен уграђени програм за преглед"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Програм за уређивање:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Подразумевани програм за уређивање датотека"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Почетни директоријум:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Подразумевани директоријум у коме ће gFTP бити по покретању"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Највећа величина дневничког прозора:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "Највећа величина дневничког прозора у бајтовима за ГТК+ верзију програма"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Удаљени скупови знакова:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -381,145 +434,206 @@ msgstr ""
 "Ово је списак скупова знакова раздвојених запетама за покушај прилагођавања "
 "удаљених порука текућем локалитету"
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL оставе:"
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Број секунди за задржавање ставки оставе пре њиховог истека."
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Надовежи преносе датотека"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Надовежи нове преносе датотека на постојеће"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Један пренос истовремено"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Ради само један пренос истовремено?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Преписивање је подразумевано"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Преписивање датотека или наставак преноса датотека су подразумевани"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Сачувај дозволе датотека"
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Сачувај дозволе пренетих датотека"
 
-#: lib/options.h:75
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "Сачувај дозволе датотека"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "Сачувај дозволе пренетих датотека"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Освежи након сваког преноса датотеке"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Освежи списак након што је свака датотека пренесена"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Прво ређај директоријуме"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Прикажи прво директоријуме па затим датотеке"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Прикажи сакривене датотеке"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Прикажи сакривене датотеке у списку"
 
-#: lib/options.h:88
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Прикажи стање преноса у наслову"
 
-#: lib/options.h:90
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Прикажи стање преноса у насловној линији"
 
-#: lib/options.h:91
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr "Покрени преносе датотека"
+
+#: lib/options.h:105
+#, fuzzy
+msgid "Automatically start the file transfers when they get queued"
+msgstr "Да аутоматски покренем преносе датотека при додавању у ред за чекање?"
+
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Дозволи ручне наредбе кроз графичко сучеље"
 
-#: lib/options.h:93
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Дозволи ручни унос наредби кроз графичко корисничко сучеље (функције као што "
 "је текстуални порт)"
 
-#: lib/options.h:95 src/gtk/options_dialog.c:1051
-#: src/gtk/options_dialog.c:1144
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Уклања локални директоријум"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Мрежа"
 
-#: lib/options.h:97
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Дозвољено време чекања:"
 
-#: lib/options.h:100
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Дозвољено време чекања за мрежни улаз/излаз. Ово НИЈЕ беспослено чекање."
 
-#: lib/options.h:102
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Поновних повезивања:"
 
-#: lib/options.h:105
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Број поновних ауто-покушаја. Поставите ово на 0 да би се покушавало "
 "неодређено много пута"
 
-#: lib/options.h:107
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Чекање пре поновног покушаја:"
 
-#: lib/options.h:110
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Број секунди чекања између покушаја"
 
-#: lib/options.h:111
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Макс КБ/с:"
 
-#: lib/options.h:114
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Највећи број КБ/с који пренос датотеке може да добије. (Поставите на 0 да "
 "бисте искључили)"
 
-#: lib/options.h:117
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "Пренос датотека"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Подразумевани протокол:"
 
-#: lib/options.h:119
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ово задаје подразумевани протокол који ће се користити"
 
-#: lib/options.h:121 lib/options.h:124
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Укључи подршку за ИП6"
 
-#: lib/options.h:129
+#: lib/options.h:159
 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"
@@ -527,27 +641,27 @@ msgstr ""
 "Ово задаје шта ће се десити када два пута притиснете име датотеке у списку.  "
 "0=Прегледај датотеку 1=Уреди датотеку 2=Пренеси датотеку"
 
-#: lib/options.h:132
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Подразумевана ширина списка локалних датотека"
 
-#: lib/options.h:135
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Подразумевана ширина списка удаљених датотека"
 
-#: lib/options.h:138
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Подразумевана висина спискова локалних/удаљених датотека"
 
-#: lib/options.h:141
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Подразумевана висина списка преноса"
 
-#: lib/options.h:144
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Подразумевана висина дневничког прозора"
 
-#: lib/options.h:147
+#: 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."
@@ -555,15 +669,15 @@ msgstr ""
 "Ширина колоне са именом датотеке у прозору преноса. Поставите ово на 0 како "
 "би се ова колона аутомагично проширивала."
 
-#: lib/options.h:151 lib/options.h:157
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Подразумевана колона по којој ће се ређати датотеке"
 
-#: lib/options.h:154 lib/options.h:160
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ређај растућим или опадајућим редоследом"
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -572,7 +686,7 @@ msgstr ""
 "како би се колоне аутомагично проширивале. Поставите ово на -1 да бисте "
 "искључили ову колону"
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -581,7 +695,7 @@ msgstr ""
 "0 како би се колоне аутомагично проширивале. Поставите ово на -1 да бисте "
 "искључили ову колону"
 
-#: lib/options.h:170 lib/options.h:188
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -590,7 +704,7 @@ msgstr ""
 "како би се колоне аутомагично проширивале. Поставите ово на -1 да бисте "
 "искључили ову колону"
 
-#: lib/options.h:173 lib/options.h:191
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -599,7 +713,7 @@ msgstr ""
 "како би се колоне аутомагично проширивале. Поставите ово на -1 да бисте "
 "искључили ову колону"
 
-#: lib/options.h:176 lib/options.h:194
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -608,7 +722,7 @@ msgstr ""
 "се колоне аутомагично проширивале. Поставите ово на -1 да бисте искључили "
 "ову колону"
 
-#: lib/options.h:179 lib/options.h:197
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -617,184 +731,147 @@ msgstr ""
 "би се колоне аутомагично проширивале. Поставите ово на -1 да бисте искључили "
 "ову колону"
 
-#: lib/options.h:200
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Боја наредби које се шаљу на сервер"
 
-#: lib/options.h:203
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Боја наредби које стижу од сервера"
 
-#: lib/options.h:206
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Боја порука о грешци"
 
-#: lib/options.h:209
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Боја осталих дневничких порука"
 
-#: lib/options.h:215 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:218 lib/options.h:220
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: lib/options.h:223 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:226 lib/options.h:228
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:231
+#: lib/options.h:270
 msgid "Local"
 msgstr "Локално"
 
-#: lib/options.h:233
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:235 src/gtk/bookmarks.c:858
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Обележивач"
 
-#: lib/protocols.c:221
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Пренос датотеке ће бити ограничен на %.2f КБ/с\n"
 
-#: lib/protocols.c:329
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
+msgstr "Учитавам списак директоријума %s из оставе\n"
+
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Учитавам списак директоријума %s из оставе\n"
 
-#: lib/protocols.c:546
+#: lib/protocols.c:450
+#, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Грешка: Не могу да упишем у оставу: %s\n"
 
-#: lib/protocols.c:578
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Грешка: не могу да пронађем обележивач %s\n"
 
-#: lib/protocols.c:585
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Грешка обележивача: Обележивач %s не садржи име домаћина\n"
 
-#: lib/protocols.c:693
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Протокол „%s“ тренутно није подржан.\n"
 
-#: lib/protocols.c:1036 lib/protocols.c:1051 lib/protocols.c:1974
-#: lib/protocols.c:2083
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Тражим %s\n"
-
-#: lib/protocols.c:1042 lib/protocols.c:1057 lib/protocols.c:1979
-#: lib/protocols.c:2088
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Не могу да пронађем домаћина  %s: %s\n"
-
-#: lib/protocols.c:1348 lib/protocols.c:1349 lib/protocols.c:1390
-#: lib/protocols.c:1391 lib/protocols.c:1450 lib/protocols.c:1457
-#: lib/protocols.c:1536 lib/protocols.c:1537 lib/protocols.c:1571
-msgid "unknown"
-msgstr "непознато"
-
-#: lib/protocols.c:1997
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Нисам успео да створим утичницу: %s\n"
-
-#: lib/protocols.c:2003 lib/protocols.c:2102
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Покушавам %s:%d\n"
-
-#: lib/protocols.c:2008 lib/protocols.c:2109
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Не могу да се повежем са %s: %s\n"
-
-#: lib/protocols.c:2040 lib/rfc959.c:633
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Нисам успео да створим ИП4 утичницу: %s\n"
-
-#: lib/protocols.c:2064 lib/sshv2.c:898
+#: lib/protocols.c:1153
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
-"Не могу да пронађем назив услуге %s/tcp. Молим проверите вашу датотеку са "
-"услугама\n"
-
-#: lib/protocols.c:2126 lib/protocols.c:2759 lib/rfc959.c:642 lib/rfc959.c:792
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Грешка: Не могу да поставим ознаку затварања при извршавању: %s\n"
-
-#: lib/protocols.c:2133
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Повезан са %s:%d\n"
-
-#: lib/protocols.c:2363 lib/protocols.c:2434
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Повезивање са %s је истекло\n"
-
-#: lib/protocols.c:2503
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Не могу да сазнам ознаке утичнице: %s\n"
 
-#: lib/protocols.c:2517
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Не могу да поставим утичницу на неблокирајућу: %s\n"
-
-#: lib/protocols.c:2653
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Грешка: Удаљено место %s је прекинуло повезивање. Највећи број покушаја је "
 "достигнут...одустајем\n"
 
-#: lib/protocols.c:2661
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Грешка: Удаљено место %s је прекинуло повезивање. Покушаћу поновно "
 "повезивање за %d секунди\n"
 
-#: lib/pty.c:288
+#: lib/protocols.c:1634 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 "Грешка: Не могу да поставим ознаку затварања при извршавању: %s\n"
+
+#: lib/pty.c:301
+#, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Не могу да отворим главни pty %s: %s\n"
+
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Не могу да створим утичнички пар: %s\n"
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Грешка: Не могу да извршим ssh: %s\n"
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Не могу да поделим процес: %s\n"
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr "Не могу да отворим главни pty %s: %s\n"
-
 #: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Име посредничког домаћина:"
@@ -835,7 +912,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:154 lib/rfc2068.c:866
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -844,35 +921,26 @@ msgstr ""
 "Примљен је погрешан одговор сервера, прекидам повезивање\n"
 "Удаљени сервер је вратио неисправну величину дела „%s“\n"
 
-#: lib/rfc2068.c:260 lib/rfc959.c:602 lib/sshv2.c:995
+#: 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:310
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "Покрећем пренос датотеке са померајем %lld\n"
-
-#: lib/rfc2068.c:318
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "Покрећем пренос датотеке са померајем %ld\n"
 
-#: lib/rfc2068.c:340
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Не могу да добавим датотеку %s\n"
 
-#: lib/rfc2068.c:442 lib/sshv2.c:1080
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Добављам списак директоријума...\n"
 
-#: lib/rfc2068.c:847 lib/sshv2.c:716 lib/sshv2.c:729 lib/sshv2.c:751
-#: lib/sshv2.c:819 lib/sshv2.c:951 lib/sshv2.c:1042 lib/sshv2.c:1110
-#: lib/sshv2.c:1223 lib/sshv2.c:1236 lib/sshv2.c:1249 lib/sshv2.c:1262
-#: lib/sshv2.c:1318 lib/sshv2.c:1383 lib/sshv2.c:1843 lib/sshv2.c:1946
-#: lib/sshv2.c:2040 lib/sshv2.c:2125 lib/sshv2.c:2211
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Примљен је погрешан одговор са сервера, прекидам повезивање\n"
 
@@ -950,10 +1018,22 @@ msgstr ""
 "бисте навели корисника посредника можете укуцати „%pu“"
 
 #: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Пасиван режим преноса датотека"
 
-#: 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. "
@@ -969,11 +1049,11 @@ msgstr ""
 "онда ће gFTP отворити порт на страни клијента а удаљени сервер ће покушати "
 "са њим да се повеже."
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Разреши удаљене симболичке везе (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 "
@@ -985,15 +1065,16 @@ msgstr ""
 "желети да ово искључите је када удаљени FTP сервер не подржава -L избор за "
 "наредбу LIST"
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Пренеси датотеке у ASCII режиму"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1003,71 +1084,133 @@ msgstr ""
 "можете оставити искључено. Уколико преузимате бинарне податке, потребно је "
 "да ово искључите."
 
-#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337 lib/rfc959.c:540
-#: lib/rfc959.c:756 lib/rfc959.c:1351
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Примељен је неисправан одговор сервера „%c“.\n"
 
-#: lib/rfc959.c:671 lib/rfc959.c:681
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Нисам успео да створим ИП4 утичницу: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Не могу да пронађем адресу IP у одговору PASV ‘%s’\n"
 
-#: lib/rfc959.c:696 lib/rfc959.c:854
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Не могу да пронађем адресу IP у одговору PASV ‘%s’\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Не могу да створим податковно повезивање: %s\n"
 
-#: lib/rfc959.c:708 lib/rfc959.c:729 lib/rfc959.c:879
+#: 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:719 lib/rfc959.c:869
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Не могу да повежем порт: %s\n"
 
-#: lib/rfc959.c:738 lib/rfc959.c:888
+#: 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:783
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Нисам успео да створим ИП6 утичницу: %s\n"
 
-#: lib/rfc959.c:803
+#: 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:832 lib/rfc959.c:841
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Неисправан EPSV одговор „%s“\n"
 
-#: lib/rfc959.c:898
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Не могу да добавим адресу локалне утичнице: %s\n"
 
-#: lib/rfc959.c:971
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Не могу да прихватим повезивање са сервером: %s\n"
 
-#: lib/rfc959.c:1489
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "укупно"
 
-#: lib/rfc959.c:1491
+#: 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"
@@ -1088,194 +1231,180 @@ msgstr "Додатни параметри програма за SSH:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Додатни параметри програма за SSH"
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr "SSH2 sftp-server путања:"
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr "Подразумевана путања удаљеног SSH2 сервера sftp"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Неопходни су SSH корисничко име/лозинка"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Захтевај корисничко име/лозинку за повезивање SSH-ом"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr "Користи алат ssh-askpass"
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "Користи ssh-askpass алат за прибављање лозинке корисника"
-
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "Користи подсистем SSH2 - SFTP"
-
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr ""
-"Позивај ssh са прекидачем -s sftp. Ово је корисно јер не морате да знате "
-"путању до удаљеног сервера sftp"
-
-#: lib/sshv2.c:259
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Покрећем програм %s\n"
 
-#: lib/sshv2.c:306 lib/sshv2.c:331
-msgid "WARNING"
-msgstr "УПОЗОРЕЊЕ"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr ""
 
-#: lib/sshv2.c:373
-msgid "Error: An incorrect password was entered\n"
-msgstr "Грешка: Унесена је нетачна лозинка\n"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
+msgstr ""
 
-#: lib/sshv2.c:376
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Лозинка:"
+
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Лозинка:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
-"Молим вас да се повежете са овим домаћином користећи програм SSH из командне "
-"линије и прикладно одговорите на ово питање.\n"
 
-#: lib/sshv2.c:379
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
-"Молим вас да исправите горње упозорење да бисте се повезали са овим "
-"домаћином.\n"
 
-#: lib/sshv2.c:418
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Унесите лозинку"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "Унесите лозинку"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "Грешка: Унесена је нетачна лозинка\n"
+
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Почетна поставка протокола\n"
 
-#: lib/sshv2.c:424
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Верзија протокола %d\n"
 
-#: lib/sshv2.c:433
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Отвори %s\n"
 
-#: lib/sshv2.c:438
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Затвори\n"
 
-#: lib/sshv2.c:444
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Отвори директоријум %s\n"
 
-#: lib/sshv2.c:449
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Прочитај директоријум\n"
 
-#: lib/sshv2.c:453
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Уклони датотеку %s\n"
 
-#: lib/sshv2.c:458
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Направи директоријум %s\n"
 
-#: lib/sshv2.c:463
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Уклони директоријум %s\n"
 
-#: lib/sshv2.c:468
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Стварна путања %s\n"
 
-#: lib/sshv2.c:473
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Атрибути датотеке\n"
 
-#: lib/sshv2.c:477
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: lib/sshv2.c:494
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: lib/sshv2.c:499
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:512 src/gtk/bookmarks.c:1017 src/gtk/bookmarks.c:1263
-#: src/gtk/chmod_dialog.c:281 src/gtk/gtkui_transfer.c:361
-#: src/gtk/misc-gtk.c:956 src/gtk/options_dialog.c:1109
-#: src/gtk/options_dialog.c:1311
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "У реду"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "КРАЈ"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Не постоји таква датотека или директоријум"
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Дозвола је одбијена"
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Грешка"
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Неисправна порука"
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Нема повезивања"
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Повезивање је изгубљено"
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Операција није подржана"
 
-#: lib/sshv2.c:539
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Сервер је вратио непознату поруку"
 
-#: lib/sshv2.c:576
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Грешка: Величина поруке %d је превелика\n"
 
-#: lib/sshv2.c:634 lib/sshv2.c:1119 lib/sshv2.c:1955 lib/sshv2.c:2049
-#: lib/sshv2.c:2137
+#: 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"
 
-#: lib/sshv2.c:640
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1283,12 +1412,12 @@ msgstr ""
 "Дошло је до грешке при почетној поставци SSH повезивања са удаљеним "
 "сервером. Грешка са удаљеног сервера следи:\n"
 
-#: lib/sshv2.c:869
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Отварам повезивање SSH ка %s\n"
 
-#: lib/sshv2.c:962
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Успешно сам се пријавио на сервер SSH %s\n"
@@ -1313,7 +1442,11 @@ msgstr "Дужина семена ентропије:"
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Највећи број бајтова за засејавање машине SSL-а"
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1326,11 +1459,11 @@ msgstr ""
 "Тема = %s\n"
 "Грешка %i:%s\n"
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Не могу да добијем потврду од друге стране\n"
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1340,56 +1473,46 @@ msgstr ""
 "повезани (%s). Прекидам повезивање.\n"
 
 # bug: should be "Cannot initialize (the) OpenSSL library"
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+#, fuzzy
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Не могу да покренем библиотеку OpenSSL\n"
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Грешка при учитавању подразумеваних потврда SSL-а\n"
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Грешка при постављању списка шифри (нема исправних шифри)\n"
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Грешка: Машина SSL-а није почетно постављена\n"
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Грешка при успостављању повезивања SSL (објекат BIO)\n"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Грешка при успостављању повезивања SSL (објекат SSL)\n"
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Грешка са потврдом друге стране: %s\n"
 
-#: src/uicommon/gftpui.c:61
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Чекам %d секунди до следећег поновног покушаја повезивања\n"
-
-#: src/uicommon/gftpui.c:72 src/gtk/chmod_dialog.c:74
-#: src/gtk/delete_dialog.c:89 src/gtk/transfer.c:213
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Операција је поништена\n"
 
-#: src/uicommon/gftpui.c:146
-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 ""
-">. Ако имате питања, коментаре, или предлоге о овом програму, слободно ми их "
-"пошаљите епоштом. Најновије вести о gFTP-у увек можете сазнати на мојем "
-"вебместу на адреси http://www.gftp.org/\n";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Чекам %d секунди до следећег поновног покушаја повезивања\n"
 
-#: src/uicommon/gftpui.c:147
+#: 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 "
@@ -1399,75 +1522,75 @@ msgstr ""
 "COPYING. Ово је слободни софтвер, а ви сте позвани да га расподелите под "
 "извесним условима; за детаље, погледајте датотеку COPYING\n"
 
-#: src/uicommon/gftpui.c:149 src/gtk/menu-items.c:495
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Превели: Горан Ракић <gox devbase net> и Страхиња Радић <mr99164 alas matf "
 "bg.ac.yu>"
 
-#: src/uicommon/gftpui.c:196 src/uicommon/gftpui.c:238
-#: src/uicommon/gftpui.c:278 src/uicommon/gftpui.c:313
-#: src/uicommon/gftpui.c:348 src/uicommon/gftpui.c:383
-#: src/uicommon/gftpui.c:419 src/uicommon/gftpui.c:482
-#: src/uicommon/gftpui.c:563 src/uicommon/gftpui.c:828
+#: 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:207
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "употреба: chmod <режим> <датотека>\n"
 
-#: src/uicommon/gftpui.c:248
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "употреба: rename <старо име> <ново име>\n"
 
-#: src/uicommon/gftpui.c:284
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "употреба: delete <датотека>\n"
 
-#: src/uicommon/gftpui.c:319
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "употреба: rmdir <директоријум>\n"
 
-#: src/uicommon/gftpui.c:354
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "употреба: site <site наредба>\n"
 
-#: src/uicommon/gftpui.c:389
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "употреба: mkdir <нови директоријум>\n"
 
-#: src/uicommon/gftpui.c:425 src/uicommon/gftpui.c:442
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "употреба: chdir <директоријум>\n"
 
-#: src/uicommon/gftpui.c:514
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Неисправан аргумент\n"
 
-#: src/uicommon/gftpui.c:527
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Очисти оставу директоријума\n"
 
-#: src/uicommon/gftpui.c:616
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "употреба: open "
 
-#: src/uicommon/gftpui.c:691
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "употреба: set [променљива = вредност]\n"
 
-#: src/uicommon/gftpui.c:705
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Грешка: Променљива %s није исправна променљива подешавања.\n"
 
-#: src/uicommon/gftpui.c:712
+#: 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:792
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1475,305 +1598,326 @@ msgstr ""
 "Подржане наредбе:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:835
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "употреба: %s <маска>\n"
 
-#: src/uicommon/gftpui.c:920
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "о програму"
 
-#: src/uicommon/gftpui.c:921
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Прикажи податке о gFTP-у"
 
-#: src/uicommon/gftpui.c:922
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: src/uicommon/gftpui.c:923
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Поставља режим преноса тренутне датотеке на Ascii (само за FTP)"
 
-#: src/uicommon/gftpui.c:924
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: src/uicommon/gftpui.c:925
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Поставља режим преноса тренутне датотеке на „бинарно“ (само за FTP)"
 
-#: src/uicommon/gftpui.c:926
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: src/uicommon/gftpui.c:927 src/uicommon/gftpui.c:929
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Мења удаљени радни директоријум"
 
-#: src/uicommon/gftpui.c:928
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: src/uicommon/gftpui.c:930
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: src/uicommon/gftpui.c:931
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Мења дозволе удаљених датотека"
 
-#: src/uicommon/gftpui.c:932
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: src/uicommon/gftpui.c:933
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Доступне могућности: остава"
 
-#: src/uicommon/gftpui.c:934
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: src/uicommon/gftpui.c:935
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Прекида повезивање са удаљеним местом"
 
-#: src/uicommon/gftpui.c:936
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Уклања удаљену датотеку"
 
-#: src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "Приказује списак директоријума тренутног удаљеног директоријума"
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "преузми"
 
-#: src/uicommon/gftpui.c:939 src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Преузима удаљене датотеке"
 
-#: src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Приказује овај прозор помоћи"
 
-#: src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: src/uicommon/gftpui.c:943 src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Мења локални радни директоријум"
 
-#: src/uicommon/gftpui.c:944
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Мења привилегије локалних датотека"
 
-#: src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Уклања локалну датотеку"
 
-#: src/uicommon/gftpui.c:950
-msgid "lls"
-msgstr "lls"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
 
-#: src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Приказује списак директоријума тренутног локалног директоријума"
 
-#: src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Ствара локални директоријум"
 
-#: src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Приказује тренутни локални директоријум"
 
-#: src/uicommon/gftpui.c:956
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Преименује локалну датотеку"
 
-#: src/uicommon/gftpui.c:958
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Уклања локални директоријум"
 
-#: src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: src/uicommon/gftpui.c:961
-msgid "Shows the directory listing for the current remote directory"
-msgstr "Приказује списак директоријума тренутног удаљеног директоријума"
-
-#: src/uicommon/gftpui.c:962
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Ствара удаљени директоријум"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: src/uicommon/gftpui.c:967 src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Шаље локалну датотеку(е)"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Отвара повезивање са удаљеним местом"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Приказује тренутни удаљени директоријум"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Излаз из gFTP-а"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Преименује удаљену датотеку"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Уклања удаљени директоријум"
 
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Приказује променљиве из датотеке са подешавањима. Можете поставити "
 "променљиве и помоћу set пром=вред"
 
-#: src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Унесите наредбу искључиву за ово место"
 
-#: src/uicommon/gftpui.c:1074
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Грешка: Наредба није препозната\n"
 
-#: src/uicommon/gftpui.c:1324
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-"Грешка: Удаљено место је прекинуло везу након покушаја преноса датотеке\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Успешно пренео %s на %.2f КБ/с\n"
 
-#: src/uicommon/gftpui.c:1390
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Прескачем датотеку %s на домаћину %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Заустављам пренос на домаћину %s\n"
+
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Нисам могао да преузмем %s са %s\n"
 
-#: src/uicommon/gftpui.c:1413
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Успешно пренео %s на %.2f КБ/с\n"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:194 src/gtk/gftp-gtk.c:1009
-#: src/gtk/misc-gtk.c:478 src/gtk/misc-gtk.c:486
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Молим вас да притиснете дугме ‘заустави’ пре него што урадите било шта "
 "друго\n"
 
-#: src/gtk/bookmarks.c:40
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Покрени обележивач"
 
-#: src/gtk/bookmarks.c:70
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Додавање обележивача: Морате унети назив обележивача\n"
 
-#: src/gtk/bookmarks.c:77
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Додавање обележивача: Не могу да додам обележивач %s јер тај назив већ "
 "постоји\n"
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Додај обележивач"
 
-#: src/gtk/bookmarks.c:141
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Додавање обележивача: Морате унети име домаћина\n"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1783,135 +1927,139 @@ msgstr ""
 "Можете раздвојити ставке знаком ‘/’ како бисте направили подмени\n"
 "(нпр: ГНУ-ова места/Дебиан)"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Запамти лозинку"
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Додавање обележивача: Морате унети назив обележивача\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Нова фасцикла"
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Унесите име нове фасцикле коју желите да створите"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Датотека/Нова ставка..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Унесите име нове ставке коју желите да створите"
 
-#: src/gtk/bookmarks.c:555
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Да ли сте сигурни да желите да обришете обележивач\n"
 "%s и све његовe потомке?"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Обриши обележивач"
 
-#: src/gtk/bookmarks.c:583
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Обележивачи"
 
-#: src/gtk/bookmarks.c:823 src/gtk/bookmarks.c:826
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Уреди ставку"
 
-#: src/gtk/bookmarks.c:863
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Опис:"
 
-#: src/gtk/bookmarks.c:878
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Име домаћина:"
 
-#: src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gtk/bookmarks.c:908
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtk/bookmarks.c:932
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Удаљени директоријум:"
 
-#: src/gtk/bookmarks.c:945
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Локални директоријум:"
 
-#: src/gtk/bookmarks.c:962
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: src/gtk/bookmarks.c:975 src/text/textui.c:82
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/gtk/bookmarks.c:989
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Налог:"
 
-#: src/gtk/bookmarks.c:1003
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Пријави се као ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1029 src/gtk/bookmarks.c:1273
-#: src/gtk/chmod_dialog.c:293 src/gtk/gtkui_transfer.c:373
-#: src/gtk/options_dialog.c:1120 src/gtk/options_dialog.c:1322
-msgid "  Cancel  "
-msgstr "  Поништи  "
-
-#: src/gtk/bookmarks.c:1039 src/gtk/options_dialog.c:1333
-msgid "Apply"
-msgstr "Примени"
-
-#: src/gtk/bookmarks.c:1189
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Датотека"
 
-#: src/gtk/bookmarks.c:1190
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Датотека/tearoff"
 
-#: src/gtk/bookmarks.c:1191
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Датотека/Нова фасцикла..."
 
-#: src/gtk/bookmarks.c:1192
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Датотека/Нова ставка..."
 
-#: src/gtk/bookmarks.c:1193
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Датотека/Обриши"
 
-#: src/gtk/bookmarks.c:1194
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Датотека/Особине..."
 
-#: src/gtk/bookmarks.c:1195
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Датотека/sep"
 
-#: src/gtk/bookmarks.c:1196
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Датотека/Затвори"
 
-#: src/gtk/bookmarks.c:1207 src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Уреди обележиваче"
 
-#: src/gtk/chmod_dialog.c:160 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1919,78 +2067,96 @@ msgstr ""
 "Сада можете подесити атрибуте ваших датотека\n"
 "Напомена: Не подржавају сви сервери ftp одлику chmod"
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Посебно"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Лепљиво"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:693
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Корисник"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Читање"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Писање"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Извршавање"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:694
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Група"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Остали"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Да ли сте сигурни да желите да обришете ових %ld датотека(е) и %ld "
 "директоријум(а)"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+"Да ли сте сигурни да желите да обришете ових %ld датотека(е) и %ld "
+"директоријум(а)"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+"Да ли сте сигурни да желите да обришете ових %ld датотека(е) и %ld "
+"директоријум(а)"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Обриши датотеке/директоријуме"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1194
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/gtk/dnd.c:146 src/gtk/dnd.c:233
-msgid "Drag-N-Drop"
-msgstr "Превуци-и-пусти"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Повежи се"
 
-#: src/gtk/dnd.c:255
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Примљен УРЛ %s\n"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "Превуци-и-пусти"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Изађи"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1998,465 +2164,511 @@ msgstr ""
 "Неки преноси су у току.\n"
 "Да ли сте сигурни да желите да изађете?"
 
-#: src/gtk/gftp-gtk.c:179
-msgid "Connect via URL"
-msgstr "Повежи се користећи адресу"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Могућности"
 
-#: src/gtk/gftp-gtk.c:179
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Унесите адресу за повезивање"
 
-#: src/gtk/gftp-gtk.c:195
-msgid "OpenURL"
-msgstr "Отвори адресу"
-
-#: src/gtk/gftp-gtk.c:218
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Прозор 1"
 
-#: src/gtk/gftp-gtk.c:221
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Прозор 2"
 
-#: src/gtk/gftp-gtk.c:222 src/gtk/gftp-gtk.c:225 src/gtk/gftp-gtk.c:228
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Аски"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Бинарно"
 
-#: src/gtk/gftp-gtk.c:226
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Могућности..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Датотека/Особине..."
 
-#: src/gtk/gftp-gtk.c:229
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Изађи"
 
-#: src/gtk/gftp-gtk.c:230
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Локално"
 
-#: src/gtk/gftp-gtk.c:231
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Локално/tearoff"
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Локално/Отвори _УРЛ..."
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Локално/Прекини повезивање"
 
-#: src/gtk/gftp-gtk.c:234 src/gtk/gftp-gtk.c:240
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Локално/sep"
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Локално/Промени маску датотека..."
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Локално/Прикажи означене"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Локално/Означи све"
 
-#: src/gtk/gftp-gtk.c:238
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Локално/Означи све датотеке"
 
-#: src/gtk/gftp-gtk.c:239
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Локално/Одзначи све"
 
-#: src/gtk/gftp-gtk.c:241
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Локално/Сачувај списак директоријума..."
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Локално/Пошаљи наредбу „SITE“..."
 
-#: src/gtk/gftp-gtk.c:243
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Локално/Промени директоријум"
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Локално/Chmod..."
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Local/Make Directory..."
-msgstr "/Локално/Направи директоријум..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Датотека/Нова фасцикла..."
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Локално/Преименуј..."
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Локално/Обриши..."
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Локално/Уреди..."
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Локално/Прегледај..."
 
-#: src/gtk/gftp-gtk.c:250
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Локално/Освежи"
 
-#: src/gtk/gftp-gtk.c:251
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Удаљено"
 
-#: src/gtk/gftp-gtk.c:252
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Удаљено/tearoff"
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Удаљено/Отвори _УРЛ.."
 
-#: src/gtk/gftp-gtk.c:255
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Удаљено/Прекини повезивање"
 
-#: src/gtk/gftp-gtk.c:257 src/gtk/gftp-gtk.c:263
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Удаљено/sep"
 
-#: src/gtk/gftp-gtk.c:258
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Удаљено/Промени маску датотека..."
 
-#: src/gtk/gftp-gtk.c:259
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Удаљено/Прикажи означене"
 
-#: src/gtk/gftp-gtk.c:260
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Удаљено/Означи све"
 
-#: src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Удаљено/Означи све датотеке"
 
-#: src/gtk/gftp-gtk.c:262
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Удаљено/Одзначи све"
 
-#: src/gtk/gftp-gtk.c:264
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Удаљено/Сачувај списак директоријума..."
 
-#: src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Удаљено/Пошаљи наредбу „SITE“..."
 
-#: src/gtk/gftp-gtk.c:266
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Удаљено/Промени директоријум"
 
-#: src/gtk/gftp-gtk.c:267
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Удаљено/Chmod..."
 
-#: src/gtk/gftp-gtk.c:268
-msgid "/Remote/Make Directory..."
-msgstr "/Удаљено/Направи директоријум"
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Датотека/Нова фасцикла..."
 
-#: src/gtk/gftp-gtk.c:269
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Удаљено/Преименуј"
 
-#: src/gtk/gftp-gtk.c:270
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Удаљено/Обриши"
 
-#: src/gtk/gftp-gtk.c:271
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Удаљено/Уреди..."
 
-#: src/gtk/gftp-gtk.c:272
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Удаљено/Прегледај..."
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Удаљено/Освежи"
 
-#: src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Обележивачи"
 
-#: src/gtk/gftp-gtk.c:275
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Обележивачи/tearoff"
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Обележивачи/Додај обележивач"
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Обележивачи/Уреди обележиваче"
 
-#: src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Обележивачи/sep"
 
-#: src/gtk/gftp-gtk.c:280
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Преноси"
 
-#: src/gtk/gftp-gtk.c:281
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Преноси/tearoff"
 
-#: src/gtk/gftp-gtk.c:282
-msgid "/Transfers/Start Transfer"
-msgstr "/Преноси/Покрени пренос"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Преноси/tearoff"
 
-#: src/gtk/gftp-gtk.c:283
-msgid "/Transfers/Stop Transfer"
-msgstr "/Преноси/Заустави пренос"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Преноси/sep"
 
-#: src/gtk/gftp-gtk.c:285 src/gtk/gftp-gtk.c:293
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Преноси/sep"
 
-#: src/gtk/gftp-gtk.c:286
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Преноси/Прескочи тренутну датотеку"
 
-#: src/gtk/gftp-gtk.c:287
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Преноси/Уклони датотеку"
 
-#: src/gtk/gftp-gtk.c:289
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Преноси/Премести датотеку _навише"
 
-#: src/gtk/gftp-gtk.c:291
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Преноси/Премести датотеку нани_же"
 
-#: src/gtk/gftp-gtk.c:294
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Преноси/Преузми датотеке"
 
-#: src/gtk/gftp-gtk.c:295
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Преноси/Пошаљи датотеке"
 
-#: src/gtk/gftp-gtk.c:296
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/_Дневник"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Дневник/tearoff"
 
-#: src/gtk/gftp-gtk.c:298
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Дневник/Очисти"
 
-#: src/gtk/gftp-gtk.c:299
-msgid "/Logging/View log..."
-msgstr "/Дневник/Прегледај дневник..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Локално/Прегледај..."
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Дневник/Сними дневник..."
 
-#: src/gtk/gftp-gtk.c:301
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Ал_ати"
 
-#: src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Алати/tearoff"
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Алати/Упореди прозоре"
 
-#: src/gtk/gftp-gtk.c:304
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Алати/Очисти оставу"
 
-#: src/gtk/gftp-gtk.c:305
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Помоћ"
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Помоћ/tearoff"
 
-#: src/gtk/gftp-gtk.c:307
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Помоћ/О програму..."
 
-#: src/gtk/gftp-gtk.c:425
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Домаћин:"
 
-#: src/gtk/gftp-gtk.c:443
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порт:"
 
-#: src/gtk/gftp-gtk.c:461
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Корисник:"
 
-#: src/gtk/gftp-gtk.c:479
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Лозинка:"
 
-#: src/gtk/gftp-gtk.c:548
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Наредба: "
 
-#: src/gtk/gftp-gtk.c:691 src/gtk/gftp-gtk.c:898 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: src/gtk/gftp-gtk.c:692
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Величина"
 
-#: src/gtk/gftp-gtk.c:695
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Датум"
 
-#: src/gtk/gftp-gtk.c:696
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Атрибути"
 
-#: src/gtk/gftp-gtk.c:899
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Прогрес"
 
-#: src/gtk/gftp-gtk.c:1010 src/gtk/misc-gtk.c:891 src/gtk/misc-gtk.c:965
-msgid "Connect"
-msgstr "Повежи се"
-
-#: src/gtk/gftp-gtk.c:1040
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Грешка: Морате унети домаћина са којим желите да се повежете\n"
 
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Освежи"
 
-#: src/gtk/gtkui.c:93
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Унесите корисничко име"
 
-#: src/gtk/gtkui.c:94
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Унесите корисничко име за ово место"
 
-#: src/gtk/gtkui.c:115 src/gtk/transfer.c:508 src/gtk/transfer.c:519
-msgid "Enter Password"
-msgstr "Унесите лозинку"
-
-#: src/gtk/gtkui.c:116 src/gtk/transfer.c:509 src/gtk/transfer.c:520
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Молимо вас да унесете лозинку за ово место"
 
-#: src/gtk/gtkui.c:272
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Операција је поништена...морате унети ниску\n"
 
-#: src/gtk/gtkui.c:310
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Прављење директоријума"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Унесите назив директоријума који желите да створите"
 
-#: src/gtk/gtkui.c:336 src/gtk/gtkui.c:348 src/gtk/misc-gtk.c:894
-#: src/gtk/misc-gtk.c:968
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Преименуј"
 
-#: src/gtk/gtkui.c:346
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "У шта желите да преименујете %s?"
 
-#: src/gtk/gtkui.c:368 src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Место"
 
-#: src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Унесите наредбу искључиву за ово место"
 
-#: src/gtk/gtkui.c:409 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr ""
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:403 src/gtk/transfer.c:486
-#: src/gtk/transfer.c:963
+#: 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:465 src/gtk/transfer.c:490
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:299
-#: src/gtk/gtkui_transfer.c:326
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:305
-#: src/gtk/gtkui_transfer.c:332
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Настави"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:302
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Прескочи"
 
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Акција"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:92
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Пренос датотека"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2464,59 +2676,59 @@ msgstr ""
 "Следеће датотеке постоје и на локалном и на удаљеном рачунару\n"
 "Молим вас да одаберете шта желите да урадите"
 
-#: src/gtk/gtkui_transfer.c:308
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Грешка"
 
-#: src/gtk/gtkui_transfer.c:338
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Прескочи датотеку"
 
-#: src/gtk/gtkui_transfer.c:348
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/gtk/gtkui_transfer.c:354
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Одзначи све"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Промена маске датотека: Операција је поништена...морате унети ниску\n"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Промени маску датотека"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Унесите нову маску датотека"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:371
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:143
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Грешка: Не могу да отворим %s за упис: %s\n"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Сачувај списак директоријума"
 
-#: src/gtk/menu-items.c:337 src/gtk/menu-items.c:395
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Грешка: Грешка приликом уписа у %s: %s\n"
 
-#: src/gtk/menu-items.c:406
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Успешно сам записао датотеку дневника %s\n"
 
-#: src/gtk/menu-items.c:418
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Сачувај дневник"
 
-#: src/gtk/menu-items.c:454
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2525,17 +2737,16 @@ msgstr ""
 "Не могу да пронађем датотеку уговора о лиценцирању COPYING. Молим вас да "
 "обезбедите да се она налази у %s или у %s"
 
-#: src/gtk/menu-items.c:458 src/gtk/menu-items.c:463
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "О програму gFTP"
 
-#: src/gtk/menu-items.c:494
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Сва права задржана (C) 1998–2003 Брајан Месни (Brian Masney) <masneyb gftp "
@@ -2543,88 +2754,79 @@ msgstr ""
 "Званична домаћа страна: http://www.gftp.org/\n";
 "Грб је направио: Арон Ворли (Aaron Worley) <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:506
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "О програму"
 
-#: src/gtk/menu-items.c:555
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Уговор о лиценцирању"
 
-#: src/gtk/menu-items.c:561 src/gtk/view_dialog.c:392
-msgid "  Close  "
-msgstr "  Затвори  "
-
-#: src/gtk/menu-items.c:643
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Упореди прозоре"
 
-#: src/gtk/misc-gtk.c:287
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "Прекида повезивање са удаљеним местом"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: src/gtk/misc-gtk.c:294
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Остављено) ["
 
-#: src/gtk/misc-gtk.c:319
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Нисам повезан"
 
-#: src/gtk/misc-gtk.c:405
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Грешка приликом отварања датотеке %s: %s\n"
 
-#: src/gtk/misc-gtk.c:494
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Нисам повезан са удаљеним местом\n"
 
-#: src/gtk/misc-gtk.c:501
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Ова могућност није доступна уз овај протокол\n"
 
-#: src/gtk/misc-gtk.c:509
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Морате имати изабрану само једну ставку\n"
 
-#: src/gtk/misc-gtk.c:516
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Мотате имати изабрану најмање једну ставку\n"
 
-#: src/gtk/misc-gtk.c:888 src/gtk/misc-gtk.c:962
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Промени"
 
-#: src/gtk/misc-gtk.c:959 src/gtk/options_dialog.c:1180
-msgid "Add"
-msgstr "Додај"
-
-#: src/gtk/misc-gtk.c:985
-msgid "Cancel"
-msgstr "Поништи"
-
-#: src/gtk/misc-gtk.c:1055
-msgid "  Yes  "
-msgstr "  Да  "
-
-#: src/gtk/misc-gtk.c:1065
-msgid "  No  "
-msgstr "  Не  "
-
-#: src/gtk/misc-gtk.c:1124
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Добављам спискове директоријума"
 
-#: src/gtk/misc-gtk.c:1144
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Заустави  "
 
-#: src/gtk/misc-gtk.c:1154
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2633,40 +2835,51 @@ msgstr ""
 "Примљено %ld директоријум(а)\n"
 "и %ld датотека(е)"
 
-#: src/gtk/misc-gtk.c:1228
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Грешка gFTP-а: Не могу да пронађем датотеку %s у %s или %s\n"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Уређивање домаћина"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Додавање домаћина"
 
-#: src/gtk/options_dialog.c:952 src/gtk/options_dialog.c:1043
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Домен"
 
-#: src/gtk/options_dialog.c:972
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "Мрежна адреса"
 
-#: src/gtk/options_dialog.c:1005 src/gtk/options_dialog.c:1145
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Мрежнамаска"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Домен"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Мрежнамаска"
 
-#: src/gtk/options_dialog.c:1151
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Локални домаћини"
 
-#: src/gtk/options_dialog.c:1187 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Уреди"
-
-#: src/gtk/options_dialog.c:1249 src/gtk/options_dialog.c:1254
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Могућности"
 
@@ -2674,35 +2887,40 @@ msgstr "Могућности"
 msgid "Receiving file names..."
 msgstr "Примам називе датотека..."
 
-#: src/gtk/transfer.c:62 src/gtk/transfer.c:639
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Повезујем се..."
 
-#: src/gtk/transfer.c:100
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Преузимање датотека: Нисам повезан са удаљеним местом\n"
 
-#: src/gtk/transfer.c:315
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Грешка: Дете %d је вратило %d\n"
 
-#: src/gtk/transfer.c:318
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Дете %d се успешно вратило\n"
 
-#: src/gtk/transfer.c:325
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Грешка: Дете %d је вратило %d\n"
+
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Грешка: Не могу да сазнам информације о датотеци %s: %s\n"
 
-#: src/gtk/transfer.c:330
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Датотека %s није промењена\n"
 
-#: src/gtk/transfer.c:338
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2711,119 +2929,233 @@ msgstr ""
 "Датотека %s је промењена.\n"
 "Да ли желите да је пошаљете?"
 
-#: src/gtk/transfer.c:341
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Уреди датотеку"
 
-#: src/gtk/transfer.c:406
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Завршено"
 
-#: src/gtk/transfer.c:446
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Заустави пренос %s\n"
-
-#: src/gtk/transfer.c:683
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr ""
-"%d%% завршено, %02d:%02d:%02d је процењено преостало. (Датотека %ld од %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Примљ %s од %s при %.2fКБ/с, %02d:%02d:%02d је процењено преостало"
 
-#: src/gtk/transfer.c:713
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Примљ %s од %s при %.2fКБ/с, %02d:%02d:%02d је процењено преостало"
 
-#: src/gtk/transfer.c:722
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Примљ %s од %s, пренос је застао, незнано времена је преостало"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Примљ %s од %s, пренос је застао, незнано времена је преостало"
 
-#: src/gtk/transfer.c:757
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
+
+#: 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 је процењено преостало. (Датотека %ld од %ld)"
+
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Добављам имена датотека...%s бајтова"
 
-#: src/gtk/transfer.c:835 src/gtk/transfer.c:857 src/gtk/transfer.c:891
-#: src/gtk/transfer.c:931 src/gtk/transfer.c:984 src/gtk/transfer.c:1044
+#: 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"
 
-#: src/gtk/transfer.c:875
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Заустављам пренос на домаћину %s\n"
-
-#: src/gtk/transfer.c:916 src/gtk/transfer.c:969
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Прескачем датотеку %s на домаћину %s\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:34
+msgid "Edit"
+msgstr "Уреди"
+
+#: 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:198
+#: 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:201
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Покрећем програм: %s %s\n"
 
-#: src/gtk/view_dialog.c:259
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Отварам %s преко %s\n"
 
-#: src/gtk/view_dialog.c:294
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Прегледам датотеку %s\n"
 
-#: src/gtk/view_dialog.c:301
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Преглед: Не могу да отворим датотеку %s: %s\n"
 
-#: src/text/gftp-text.c:169
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Не могу да отворим управљачки терминал %s\n"
 
-#: src/text/textui.c:70
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Корисничко име [anonymous]:"
 
 # bug: *BAD* for translation!
-#: src/text/textui.c:139
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s већ постоји. (изворна величина %s, одредишна величина %s):\n"
 "(o)пресними, (r)настави, (s)прескочи, (O)пресними све, (R)настави све, (S)"
 "прескочи све: (%c)"
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Почетни директоријум:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Подразумевани директоријум у коме ће gFTP бити по покретању"
+
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Покрећем пренос датотеке са померајем %lld\n"
+
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "SSH2 sftp-server путања:"
+
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "Подразумевана путања удаљеног SSH2 сервера sftp"
+
+#~ msgid "Use ssh-askpass utility"
+#~ msgstr "Користи алат ssh-askpass"
+
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "Користи ssh-askpass алат за прибављање лозинке корисника"
+
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "Користи подсистем SSH2 - SFTP"
+
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "Позивај ssh са прекидачем -s sftp. Ово је корисно јер не морате да знате "
+#~ "путању до удаљеног сервера sftp"
+
+#~ msgid "WARNING"
+#~ msgstr "УПОЗОРЕЊЕ"
+
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "Молим вас да се повежете са овим домаћином користећи програм SSH из "
+#~ "командне линије и прикладно одговорите на ово питање.\n"
+
+#~ msgid "Please correct the above warning to connect to this host.\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 ""
+#~ ">. Ако имате питања, коментаре, или предлоге о овом програму, слободно ми "
+#~ "их пошаљите епоштом. Најновије вести о gFTP-у увек можете сазнати на "
+#~ "мојем вебместу на адреси http://www.gftp.org/\n";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Грешка: Удаљено место је прекинуло везу након покушаја преноса датотеке\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Поништи  "
+
+#~ msgid "Apply"
+#~ msgstr "Примени"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Повежи се користећи адресу"
+
+#~ msgid "OpenURL"
+#~ msgstr "Отвори адресу"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Могућности..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Локално/Направи директоријум..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Удаљено/Направи директоријум"
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Преноси/Покрени пренос"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Преноси/Заустави пренос"
+
+#~ msgid "/Logging/View log..."
+#~ msgstr "/Дневник/Прегледај дневник..."
+
+#~ msgid "  Close  "
+#~ msgstr "  Затвори  "
+
+#~ msgid "Add"
+#~ msgstr "Додај"
+
+#~ msgid "Cancel"
+#~ msgstr "Поништи"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Да  "
+
+#~ msgid "  No  "
+#~ msgstr "  Не  "
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Заустави пренос %s\n"
+
 #~ msgid "Received invalid response to PWD command: '%s'\n"
 #~ msgstr "Примио сам неисправан одзив на PWD команду: ‘%s’\n"
 
@@ -3002,12 +3334,5 @@ msgstr ""
 #~ msgid "Send PASV command or PORT command for data transfers"
 #~ msgstr "Пошаљи наредбе PASV или PORT при преносу података"
 
-#~ msgid "Automatically start the file transfers when they get queued?"
-#~ msgstr ""
-#~ "Да аутоматски покренем преносе датотека при додавању у ред за чекање?"
-
-#~ msgid "Start file transfers"
-#~ msgstr "Покрени преносе датотека"
-
 #~ msgid "Enter your email address here"
 #~ msgstr "Овде унесите вашу еадресу"
diff --git a/po/sr Latn po b/po/sr Latn po
index 1bf5921..0399400 100644
--- a/po/sr Latn po
+++ b/po/sr Latn po
@@ -8,16 +8,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp-2.0.14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 17:53+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-03-01 17:53+0100\n"
 "Last-Translator: Strahinja Radić <mr99164 alas matf bg ac yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista nongnu org>\n"
+"Language: sr Latn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Neispravan URL %s\n"
@@ -27,68 +28,76 @@ msgstr "Neispravan URL %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Greška: Pogrešan red %s u datoteci indeksa ostave\n"
 
-#: lib/cache.c:137 lib/local.c:534
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Greška: Ne mogu da stvorim direktorijum %s: %s\n"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Greška: Ne mogu da stvorim privremenu datoteku: %s\n"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:265 lib/sshv2.c:1000
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Greška prilikom zatvaranja opisnika datoteke: %s\n"
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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 "Greška: Ne mogu da pretražim datoteku %s: %s\n"
 
-#: lib/config_file.c:117 lib/config_file.c:124 lib/protocols.c:2750
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Greška: Ne mogu da otvorim lokalnu datoteku %s: %s\n"
 
-#: lib/config_file.c:134 lib/protocols.c:2455 lib/sslcommon.c:467
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Greška: Ne mogu da pišem u utičnicu: %s\n"
 
-#: lib/config_file.c:142 lib/protocols.c:2383 lib/sslcommon.c:421
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Greška: Ne mogu da čitam sa utičnice: %s\n"
 
-#: lib/config_file.c:174 lib/config_file.c:730
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "Greška gFTP-a: Neispravan naziv datoteke sa obeleživačima %s\n"
 
-#: lib/config_file.c:183
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Upozorenje: Ne mogu da pronađem glavnu datoteku sa obeleživačima %s\n"
 
-#: lib/config_file.c:194 lib/config_file.c:736
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu da otvorim datoteku sa obeleživačima %s: %s\n"
 
-#: lib/config_file.c:286 lib/config_file.c:308
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Upozorenje gFTP-a: Preskačem red %d u datoteci sa obeleživačima: %s\n"
 
-#: lib/config_file.c:338
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "Upozorenje gFTP-a: Red %d ne sadrži dovoljno parametara\n"
 
-#: lib/config_file.c:499
+#: 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 "
@@ -98,7 +107,7 @@ msgstr ""
 "posrednički server (ako je dostupan). Sintaksa: dont_use_proxy=.domen ili "
 "dont_use_proxy=mrežni broj/mrežnamaska"
 
-#: lib/config_file.c:502
+#: 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"
@@ -106,63 +115,64 @@ msgstr ""
 "ext=vrsta datoteke:XPM datoteka:aski ili binarna (latinično „A“ ili „B“):"
 "program za pregled. Napomena: Svi argumenti osim vrste datoteke su neobavezni"
 
-#: lib/config_file.c:580 lib/config_file.c:819
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "Greška gFTP-a: Neispravan naziv datoteke sa podešavanjima %s\n"
 
-#: lib/config_file.c:591
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu da napravim direktorijum %s: %s\n"
 
-#: lib/config_file.c:601
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr ""
 "Greška gFTP-a: Ne mogu da pronađem glavnu datoteku sa podešavanjima %s\n"
 
-#: lib/config_file.c:603
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Da li ste instalirali program (make install)?\n"
 
-#: lib/config_file.c:612 lib/config_file.c:825
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "Greška gFTP-a: Ne mogu da otvorim datoteku sa podešavanjima %s: %s\n"
 
-#: lib/config_file.c:651
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Prekida usled greške pri raščlanjivanju reda %d u datoteci sa podešavanjima\n"
 
-#: lib/config_file.c:657
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "Upozorenje gFTP-a: Preskačem red %d u datoteci sa podešavanjima: %s\n"
 
-#: lib/config_file.c:664
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Greška gFTP-a: Neispravno ime dnevničke datoteke %s\n"
 
-#: lib/config_file.c:670
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "Upozorenje gFTP-a: Ne mogu da otvorim %s za upis: %s\n"
 
-#: lib/config_file.c:725
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Datoteka sa obeleživačima za gFTP. Sva prava zadržana (C) 1998–2002 Brajan "
 "Mesni (Brian Masney) <masneyb gftp org>. Upozorenje: Svi komentari koje "
 "dodate ovoj datoteci će biti obrisani"
 
-#: lib/config_file.c:726
+#: 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 "
@@ -174,169 +184,220 @@ msgstr ""
 "lako zapamti vašu lozinku dok uređujete ovu datoteku. Pre ovoga, sve lozinke "
 "su čuvane kao čist tekst."
 
-#: lib/config_file.c:832
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
 "Datoteka sa podešavanjima za gFTP. Sva prava zadržana (C) 1998-2002 Brajan "
-"Mesni (Brian Masney) <masneyb gftp org>. Upozorenje: Svi komentari u datoteci "
-"će biti obrisani. Ako unos sadrži (*) u svom komentaru, onda ga ne možete "
-"izmeniti iz gFTP-a"
+"Mesni (Brian Masney) <masneyb gftp org>. Upozorenje: Svi komentari u "
+"datoteci će biti obrisani. Ako unos sadrži (*) u svom komentaru, onda ga ne "
+"možete izmeniti iz gFTP-a"
 
-#: lib/config_file.c:1196 lib/rfc2068.c:568 lib/rfc2068.c:569
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<nepoznat>"
 
-#: lib/config_file.c:1272 lib/config_file.c:1335 lib/config_file.c:1377
-#: lib/config_file.c:1410
+#: 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 ""
 "Kobna greška gFTP-a: Izbor podešavanja „%s“ nije nađen u opštoj tabeli heša\n"
 
-#: lib/ftps.c:138
-msgid ""
-"FTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Podrška za FTPS nije dostupna pošto nije prisutna podrška za SSL. Prekidam "
-"povezivanje.\n"
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "Greška: Ne mogu da otvorim lokalnu datoteku %s: %s\n"
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
-"Podrška za HTTPS nije dostupna pošto nije prisutna podrška za SSL. Prekidam "
-"povezivanje.\n"
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "Greška: Ne mogu da pretražim datoteku %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Ne mogu da promenim lokalni direktorijum u %s: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "Greška: Greška prilikom upisa u %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Ne mogu da saznam trenutni direktorijum: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "Ne mogu da prihvatim povezivanje sa serverom: %s\n"
 
-#: lib/local.c:179
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "Greška: Ne mogu da skratim lokalnu datoteku %s: %s\n"
+#: 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 "nepoznato"
 
-#: lib/local.c:404
-#, c-format
-msgid "Could not get local directory listing %s: %s\n"
+#: lib/fsp.c:377
+#, fuzzy, c-format
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Ne mogu da dobavim spisak lokalnih direktorijuma %s: %s\n"
 
-#: lib/local.c:441
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "Uspešno promenjen lokalni direktorijum u %s\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:229
-#: src/gtk/view_dialog.c:316
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "Ne mogu da promenim lokalni direktorijum u %s: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Uspešno uklonjeno %s\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Greška: Ne mogu da uklonim direktorijum %s: %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:233 src/gtk/view_dialog.c:320
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Greška: Ne mogu da uklonim datoteku  %s: %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Uspešno stvoren direktorijum  %s\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Uspešno preimenovano  %s u %s\n"
 
-#: lib/local.c:560
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Greška: Ne mogu da preimenujem %s u %s: %s\n"
 
-#: lib/local.c:583
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podrška za FTPS nije dostupna pošto nije prisutna podrška za SSL. Prekidam "
+"povezivanje.\n"
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+"Podrška za HTTPS nije dostupna pošto nije prisutna podrška za SSL. Prekidam "
+"povezivanje.\n"
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "Uspešno promenjen režim %s u %d\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "Ne mogu da saznam trenutni direktorijum: %s\n"
 
-#: lib/local.c:590
+#: lib/local.c:105
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Successfully changed local directory to %s\n"
+msgstr "Uspešno promenjen lokalni direktorijum u %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Ne mogu da promenim lokalni direktorijum u %s: %s\n"
+
+#: lib/local.c:238
+#, c-format
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "Greška: Ne mogu da skratim lokalnu datoteku %s: %s\n"
+
+#: lib/local.c:424
+#, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "Ne mogu da dobavim spisak lokalnih direktorijuma %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "Uspešno promenjen režim %s u %d\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Greška: Ne mogu da promenim režim %s u %d: %s\n"
 
-#: lib/local.c:682
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Uspešno promenjen režim %s u %d\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Greška: Ne mogu da promenim režim %s u %d: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalni sistem datoteka"
 
-#: lib/misc.c:415
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "upotreba: gftp "
 
-#: lib/misc.c:415 src/uicommon/gftpui.c:616
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "nijedan"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "datoteka"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "veličina"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "korisnik"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "grupa"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datum i vreme"
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "atributi"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "opadajuće"
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "rastuće"
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Opšte"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Program za pregled:"
 
-#: lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -344,36 +405,28 @@ msgstr ""
 "Podrazumevani program za pregled datoteka. Ako ovo ostavite prazno, biće "
 "korišćen ugrađeni program za pregled"
 
-#: lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Program za uređivanje:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Podrazumevani program za uređivanje datoteka"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Početni direktorijum:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Podrazumevani direktorijum u kome će gFTP biti po pokretanju"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Najveća veličina dnevničkog prozora:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "Najveća veličina dnevničkog prozora u bajtovima za GTK+ verziju programa"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Udaljeni skupovi znakova:"
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -381,145 +434,207 @@ msgstr ""
 "Ovo je spisak skupova znakova razdvojenih zapetama za pokušaj prilagođavanja "
 "udaljenih poruka tekućem lokalitetu"
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "TTL ostave:"
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Broj sekundi za zadržavanje stavki ostave pre njihovog isteka."
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Nadoveži prenose datoteka"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Nadoveži nove prenose datoteka na postojeće"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Jedan prenos istovremeno"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Radi samo jedan prenos istovremeno?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Prepisivanje je podrazumevano"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Prepisivanje datoteka ili nastavak prenosa datoteka su podrazumevani"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Sačuvaj dozvole datoteka"
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Sačuvaj dozvole prenetih datoteka"
 
-#: lib/options.h:75
+#: lib/options.h:82
+#, fuzzy
+msgid "Preserve file time"
+msgstr "Sačuvaj dozvole datoteka"
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "Sačuvaj dozvole prenetih datoteka"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Osveži nakon svakog prenosa datoteke"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Osveži spisak nakon što je svaka datoteka prenesena"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Prvo ređaj direktorijume"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Prikaži prvo direktorijume pa zatim datoteke"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Prikaži sakrivene datoteke"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Prikaži sakrivene datoteke u spisku"
 
-#: lib/options.h:88
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Prikaži stanje prenosa u naslovu"
 
-#: lib/options.h:90
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Prikaži stanje prenosa u naslovnoj liniji"
 
-#: lib/options.h:91
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr "Pokreni prenose datoteka"
+
+#: lib/options.h:105
+#, fuzzy
+msgid "Automatically start the file transfers when they get queued"
+msgstr ""
+"Da automatski pokrenem prenose datoteka pri dodavanju u red za čekanje?"
+
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Dozvoli ručne naredbe kroz grafičko sučelje"
 
-#: lib/options.h:93
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
-"Dozvoli ručni unos naredbi kroz grafičko korisničko sučelje (funkcije kao što "
-"je tekstualni port)"
+"Dozvoli ručni unos naredbi kroz grafičko korisničko sučelje (funkcije kao "
+"što je tekstualni port)"
+
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Uklanja lokalni direktorijum"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
 
-#: lib/options.h:95 src/gtk/options_dialog.c:1051
-#: src/gtk/options_dialog.c:1144
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Mreža"
 
-#: lib/options.h:97
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Dozvoljeno vreme čekanja:"
 
-#: lib/options.h:100
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Dozvoljeno vreme čekanja za mrežni ulaz/izlaz. Ovo NIJE besposleno čekanje."
 
-#: lib/options.h:102
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Ponovnih povezivanja:"
 
-#: lib/options.h:105
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Broj ponovnih auto-pokušaja. Postavite ovo na 0 da bi se pokušavalo "
 "neodređeno mnogo puta"
 
-#: lib/options.h:107
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Čekanje pre ponovnog pokušaja:"
 
-#: lib/options.h:110
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Broj sekundi čekanja između pokušaja"
 
-#: lib/options.h:111
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Maks KB/s:"
 
-#: lib/options.h:114
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Najveći broj KB/s koji prenos datoteke može da dobije. (Postavite na 0 da "
 "biste isključili)"
 
-#: lib/options.h:117
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "Prenos datoteka"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Podrazumevani protokol:"
 
-#: lib/options.h:119
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Ovo zadaje podrazumevani protokol koji će se koristiti"
 
-#: lib/options.h:121 lib/options.h:124
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Uključi podršku za IP6"
 
-#: lib/options.h:129
+#: lib/options.h:159
 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"
@@ -527,27 +642,27 @@ msgstr ""
 "Ovo zadaje šta će se desiti kada dva puta pritisnete ime datoteke u spisku.  "
 "0=Pregledaj datoteku 1=Uredi datoteku 2=Prenesi datoteku"
 
-#: lib/options.h:132
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Podrazumevana širina spiska lokalnih datoteka"
 
-#: lib/options.h:135
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Podrazumevana širina spiska udaljenih datoteka"
 
-#: lib/options.h:138
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Podrazumevana visina spiskova lokalnih/udaljenih datoteka"
 
-#: lib/options.h:141
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Podrazumevana visina spiska prenosa"
 
-#: lib/options.h:144
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Podrazumevana visina dnevničkog prozora"
 
-#: lib/options.h:147
+#: 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."
@@ -555,15 +670,15 @@ msgstr ""
 "Širina kolone sa imenom datoteke u prozoru prenosa. Postavite ovo na 0 kako "
 "bi se ova kolona automagično proširivala."
 
-#: lib/options.h:151 lib/options.h:157
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Podrazumevana kolona po kojoj će se ređati datoteke"
 
-#: lib/options.h:154 lib/options.h:160
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Ređaj rastućim ili opadajućim redosledom"
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -572,7 +687,7 @@ msgstr ""
 "kako bi se kolone automagično proširivale. Postavite ovo na -1 da biste "
 "isključili ovu kolonu"
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -581,7 +696,7 @@ msgstr ""
 "0 kako bi se kolone automagično proširivale. Postavite ovo na -1 da biste "
 "isključili ovu kolonu"
 
-#: lib/options.h:170 lib/options.h:188
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -590,7 +705,7 @@ msgstr ""
 "kako bi se kolone automagično proširivale. Postavite ovo na -1 da biste "
 "isključili ovu kolonu"
 
-#: lib/options.h:173 lib/options.h:191
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -599,7 +714,7 @@ msgstr ""
 "kako bi se kolone automagično proširivale. Postavite ovo na -1 da biste "
 "isključili ovu kolonu"
 
-#: lib/options.h:176 lib/options.h:194
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -608,193 +723,156 @@ msgstr ""
 "se kolone automagično proširivale. Postavite ovo na -1 da biste isključili "
 "ovu kolonu"
 
-#: lib/options.h:179 lib/options.h:197
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
 "Širina kolone sa atributima u spiskovima datoteka. Postavite ovo na 0 kako "
-"bi se kolone automagično proširivale. Postavite ovo na -1 da biste isključili "
-"ovu kolonu"
+"bi se kolone automagično proširivale. Postavite ovo na -1 da biste "
+"isključili ovu kolonu"
 
-#: lib/options.h:200
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Boja naredbi koje se šalju na server"
 
-#: lib/options.h:203
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Boja naredbi koje stižu od servera"
 
-#: lib/options.h:206
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Boja poruka o grešci"
 
-#: lib/options.h:209
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Boja ostalih dnevničkih poruka"
 
-#: lib/options.h:215 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: lib/options.h:218 lib/options.h:220
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: lib/options.h:223 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:226 lib/options.h:228
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: lib/options.h:231
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokalno"
 
-#: lib/options.h:233
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:235 src/gtk/bookmarks.c:858
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Obeleživač"
 
-#: lib/protocols.c:221
+#: lib/options.h:275
+#, fuzzy
+msgid "FSP"
+msgstr "FTP"
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Prenos datoteke će biti ograničen na %.2f KB/s\n"
 
-#: lib/protocols.c:329
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
+msgstr "Učitavam spisak direktorijuma %s iz ostave\n"
+
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Učitavam spisak direktorijuma %s iz ostave\n"
 
-#: lib/protocols.c:546
+#: lib/protocols.c:450
+#, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Greška: Ne mogu da upišem u ostavu: %s\n"
 
-#: lib/protocols.c:578
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Greška: ne mogu da pronađem obeleživač %s\n"
 
-#: lib/protocols.c:585
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Greška obeleživača: Obeleživač %s ne sadrži ime domaćina\n"
 
-#: lib/protocols.c:693
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokol „%s“ trenutno nije podržan.\n"
 
-#: lib/protocols.c:1036 lib/protocols.c:1051 lib/protocols.c:1974
-#: lib/protocols.c:2083
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Tražim %s\n"
-
-#: lib/protocols.c:1042 lib/protocols.c:1057 lib/protocols.c:1979
-#: lib/protocols.c:2088
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Ne mogu da pronađem domaćina  %s: %s\n"
-
-#: lib/protocols.c:1348 lib/protocols.c:1349 lib/protocols.c:1390
-#: lib/protocols.c:1391 lib/protocols.c:1450 lib/protocols.c:1457
-#: lib/protocols.c:1536 lib/protocols.c:1537 lib/protocols.c:1571
-msgid "unknown"
-msgstr "nepoznato"
-
-#: lib/protocols.c:1997
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Nisam uspeo da stvorim utičnicu: %s\n"
-
-#: lib/protocols.c:2003 lib/protocols.c:2102
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Pokušavam %s:%d\n"
-
-#: lib/protocols.c:2008 lib/protocols.c:2109
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Ne mogu da se povežem sa %s: %s\n"
-
-#: lib/protocols.c:2040 lib/rfc959.c:633
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Nisam uspeo da stvorim IP4 utičnicu: %s\n"
-
-#: lib/protocols.c:2064 lib/sshv2.c:898
+#: lib/protocols.c:1153
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Found recursive symbolic link %s\n"
 msgstr ""
-"Ne mogu da pronađem naziv usluge %s/tcp. Molim proverite vašu datoteku sa "
-"uslugama\n"
-
-#: lib/protocols.c:2126 lib/protocols.c:2759 lib/rfc959.c:642 lib/rfc959.c:792
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Greška: Ne mogu da postavim oznaku zatvaranja pri izvršavanju: %s\n"
-
-#: lib/protocols.c:2133
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Povezan sa %s:%d\n"
-
-#: lib/protocols.c:2363 lib/protocols.c:2434
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Povezivanje sa %s je isteklo\n"
 
-#: lib/protocols.c:2503
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Ne mogu da saznam oznake utičnice: %s\n"
-
-#: lib/protocols.c:2517
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Ne mogu da postavim utičnicu na neblokirajuću: %s\n"
-
-#: lib/protocols.c:2653
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Greška: Udaljeno mesto %s je prekinulo povezivanje. Najveći broj pokušaja je "
 "dostignut...odustajem\n"
 
-#: lib/protocols.c:2661
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Greška: Udaljeno mesto %s je prekinulo povezivanje. Pokušaću ponovno "
 "povezivanje za %d sekundi\n"
 
-#: lib/pty.c:288
+#: lib/protocols.c:1634 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 "Greška: Ne mogu da postavim oznaku zatvaranja pri izvršavanju: %s\n"
+
+#: lib/pty.c:301
+#, c-format
+msgid "Cannot open master pty %s: %s\n"
+msgstr "Ne mogu da otvorim glavni pty %s: %s\n"
+
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Ne mogu da stvorim utičnički par: %s\n"
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Greška: Ne mogu da izvršim ssh: %s\n"
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Ne mogu da podelim proces: %s\n"
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr "Ne mogu da otvorim glavni pty %s: %s\n"
-
 #: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Ime posredničkog domaćina:"
@@ -835,7 +913,7 @@ msgstr "Koristi HTTP/1.1"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Da li želite da koristite HTTP/1.1 ili HTTP/1.0"
 
-#: lib/rfc2068.c:154 lib/rfc2068.c:866
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -844,35 +922,26 @@ msgstr ""
 "Primljen je pogrešan odgovor servera, prekidam povezivanje\n"
 "Udaljeni server je vratio neispravnu veličinu dela „%s“\n"
 
-#: lib/rfc2068.c:260 lib/rfc959.c:602 lib/sshv2.c:995
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Prekidam povezivanje sa mestom %s\n"
 
-#: lib/rfc2068.c:310
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "Pokrećem prenos datoteke sa pomerajem %lld\n"
-
-#: lib/rfc2068.c:318
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "Pokrećem prenos datoteke sa pomerajem %ld\n"
 
-#: lib/rfc2068.c:340
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Ne mogu da dobavim datoteku %s\n"
 
-#: lib/rfc2068.c:442 lib/sshv2.c:1080
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Dobavljam spisak direktorijuma...\n"
 
-#: lib/rfc2068.c:847 lib/sshv2.c:716 lib/sshv2.c:729 lib/sshv2.c:751
-#: lib/sshv2.c:819 lib/sshv2.c:951 lib/sshv2.c:1042 lib/sshv2.c:1110
-#: lib/sshv2.c:1223 lib/sshv2.c:1236 lib/sshv2.c:1249 lib/sshv2.c:1262
-#: lib/sshv2.c:1318 lib/sshv2.c:1383 lib/sshv2.c:1843 lib/sshv2.c:1946
-#: lib/sshv2.c:2040 lib/sshv2.c:2125 lib/sshv2.c:2211
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Primljen je pogrešan odgovor sa servera, prekidam povezivanje\n"
 
@@ -917,8 +986,8 @@ msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr ""
-"Ovo je lozinka koja će se koristiti kada god se prijavljujete anonimno na FTP "
-"server"
+"Ovo je lozinka koja će se koristiti kada god se prijavljujete anonimno na "
+"FTP server"
 
 #: lib/rfc959.c:59
 msgid "Proxy account:"
@@ -950,10 +1019,22 @@ msgstr ""
 "biste naveli korisnika posrednika možete ukucati „%pu“"
 
 #: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr ""
+
+#: 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 ""
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasivan režim prenosa datoteka"
 
-#: 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. "
@@ -964,16 +1045,16 @@ msgid ""
 msgstr ""
 "Ukoliko je ovo uključeno, onda će udaljeni server FTP otvoriti port za ovo "
 "podatkovno povezivanje. Ukoliko ste iza zaštitnog zida, moraćete da ovo "
-"uključite. Uopšte, poželjno je da ovo bude uključeno osim ukoliko se povezujete "
-"sa starijim serverom FTP koji ovo ne podržava. Ukoliko je ovo isključeno, "
-"onda će gFTP otvoriti port na strani klijenta a udaljeni server će pokušati "
-"sa njim da se poveže."
+"uključite. Uopšte, poželjno je da ovo bude uključeno osim ukoliko se "
+"povezujete sa starijim serverom FTP koji ovo ne podržava. Ukoliko je ovo "
+"isključeno, onda će gFTP otvoriti port na strani klijenta a udaljeni server "
+"će pokušati sa njim da se poveže."
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Razreši udaljene simboličke veze (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 "
@@ -981,93 +1062,156 @@ msgid ""
 "option to LIST"
 msgstr ""
 "Udaljeni server FTP će pokušati da razreši simboličke veze u spiskovima "
-"direktorijuma. Uopšte, poželjno je ovo ostaviti uključeno. Jedino kada možete "
-"želeti da ovo isključite je kada udaljeni FTP server ne podržava -L izbor za "
-"naredbu LIST"
+"direktorijuma. Uopšte, poželjno je ovo ostaviti uključeno. Jedino kada "
+"možete želeti da ovo isključite je kada udaljeni FTP server ne podržava -L "
+"izbor za naredbu LIST"
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Prenesi datoteke u ASCII režimu"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 "Ukoliko prenosite tekstualnu datoteku sa Vindovsa na Uniks ili obrnuto, onda "
-"bi trebalo ovo da uključite. Svaki sistem predstavlja nove redove na drugačiji "
-"način u tekstualnim datotekama. Ukoliko prenosite sa Uniksa na Uniks, onda "
-"možete ostaviti isključeno. Ukoliko preuzimate binarne podatke, potrebno je "
-"da ovo isključite."
+"bi trebalo ovo da uključite. Svaki sistem predstavlja nove redove na "
+"drugačiji način u tekstualnim datotekama. Ukoliko prenosite sa Uniksa na "
+"Uniks, onda možete ostaviti isključeno. Ukoliko preuzimate binarne podatke, "
+"potrebno je da ovo isključite."
 
-#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337 lib/rfc959.c:540
-#: lib/rfc959.c:756 lib/rfc959.c:1351
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Primeljen je neispravan odgovor servera „%c“.\n"
 
-#: lib/rfc959.c:671 lib/rfc959.c:681
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Nisam uspeo da stvorim IP4 utičnicu: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Ne mogu da pronađem adresu IP u odgovoru PASV ‘%s’\n"
 
-#: lib/rfc959.c:696 lib/rfc959.c:854
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Ne mogu da pronađem adresu IP u odgovoru PASV ‘%s’\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Ne mogu da stvorim podatkovno povezivanje: %s\n"
 
-#: lib/rfc959.c:708 lib/rfc959.c:729 lib/rfc959.c:879
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Ne mogu da dobavim naziv utičnice: %s\n"
 
-#: lib/rfc959.c:719 lib/rfc959.c:869
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Ne mogu da povežem port: %s\n"
 
-#: lib/rfc959.c:738 lib/rfc959.c:888
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Ne mogu da slušam na portu %d: %s\n"
 
-#: lib/rfc959.c:783
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Nisam uspeo da stvorim IP6 utičnicu: %s\n"
 
-#: lib/rfc959.c:803
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "Greška: Izgleda da nismo povezani pomoću IPv6. Prekidam povezivanje.\n"
 
-#: lib/rfc959.c:832 lib/rfc959.c:841
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Neispravan EPSV odgovor „%s“\n"
 
-#: lib/rfc959.c:898
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Ne mogu da dobavim adresu lokalne utičnice: %s\n"
 
-#: lib/rfc959.c:971
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Ne mogu da prihvatim povezivanje sa serverom: %s\n"
 
-#: lib/rfc959.c:1489
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ukupno"
 
-#: lib/rfc959.c:1491
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Upozorenje: Ne mogu da raščlanim spisak %s\n"
 
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Tražim %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 "Ne mogu da pronađem domaćina  %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Nisam uspeo da stvorim utičnicu: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Pokušavam %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 "Ne mogu da se povežem sa %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Povezan sa %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 ""
+"Ne mogu da pronađem naziv usluge %s/tcp. Molim proverite vašu datoteku sa "
+"uslugama\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Povezivanje sa %s je isteklo\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Ne mogu da saznam oznake utičnice: %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Ne mogu da postavim utičnicu na neblokirajuću: %s\n"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -1088,194 +1232,180 @@ msgstr "Dodatni parametri programa za SSH:"
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Dodatni parametri programa za SSH"
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr "SSH2 sftp-server putanja:"
-
-#: lib/sshv2.c:39
-msgid "Default remote SSH2 sftp-server path"
-msgstr "Podrazumevana putanja udaljenog SSH2 servera sftp"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Neophodni su SSH korisničko ime/lozinka"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Zahtevaj korisničko ime/lozinku za povezivanje SSH-om"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
-msgstr "Koristi alat ssh-askpass"
-
-#: lib/sshv2.c:48
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "Koristi ssh-askpass alat za pribavljanje lozinke korisnika"
-
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "Koristi podsistem SSH2 - SFTP"
-
-#: lib/sshv2.c:53
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
-msgstr ""
-"Pozivaj ssh sa prekidačem -s sftp. Ovo je korisno jer ne morate da znate "
-"putanju do udaljenog servera sftp"
-
-#: lib/sshv2.c:259
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Pokrećem program %s\n"
 
-#: lib/sshv2.c:306 lib/sshv2.c:331
-msgid "WARNING"
-msgstr "UPOZORENjE"
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
+msgstr ""
+
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
+msgstr ""
 
-#: lib/sshv2.c:373
-msgid "Error: An incorrect password was entered\n"
-msgstr "Greška: Unesena je netačna lozinka\n"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
 
-#: lib/sshv2.c:376
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
+#: lib/sshv2.c:381
+#, fuzzy
+msgid "password"
+msgstr "Lozinka:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
-"Molim vas da se povežete sa ovim domaćinom koristeći program SSH iz komandne "
-"linije i prikladno odgovorite na ovo pitanje.\n"
 
-#: lib/sshv2.c:379
-msgid "Please correct the above warning to connect to this host.\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
 msgstr ""
-"Molim vas da ispravite gornje upozorenje da biste se povezali sa ovim "
-"domaćinom.\n"
 
-#: lib/sshv2.c:418
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "Unesite lozinku"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "Unesite lozinku"
+
+#: lib/sshv2.c:567
+msgid "Error: An incorrect password was entered\n"
+msgstr "Greška: Unesena je netačna lozinka\n"
+
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Početna postavka protokola\n"
 
-#: lib/sshv2.c:424
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Verzija protokola %d\n"
 
-#: lib/sshv2.c:433
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Otvori %s\n"
 
-#: lib/sshv2.c:438
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Zatvori\n"
 
-#: lib/sshv2.c:444
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Otvori direktorijum %s\n"
 
-#: lib/sshv2.c:449
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Pročitaj direktorijum\n"
 
-#: lib/sshv2.c:453
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Ukloni datoteku %s\n"
 
-#: lib/sshv2.c:458
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Napravi direktorijum %s\n"
 
-#: lib/sshv2.c:463
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Ukloni direktorijum %s\n"
 
-#: lib/sshv2.c:468
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Stvarna putanja %s\n"
 
-#: lib/sshv2.c:473
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Atributi datoteke\n"
 
-#: lib/sshv2.c:477
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: lib/sshv2.c:494
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: lib/sshv2.c:499
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:512 src/gtk/bookmarks.c:1017 src/gtk/bookmarks.c:1263
-#: src/gtk/chmod_dialog.c:281 src/gtk/gtkui_transfer.c:361
-#: src/gtk/misc-gtk.c:956 src/gtk/options_dialog.c:1109
-#: src/gtk/options_dialog.c:1311
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "U redu"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "KRAJ"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ne postoji takva datoteka ili direktorijum"
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Dozvola je odbijena"
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Greška"
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Neispravna poruka"
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Nema povezivanja"
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Povezivanje je izgubljeno"
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Operacija nije podržana"
 
-#: lib/sshv2.c:539
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Server je vratio nepoznatu poruku"
 
-#: lib/sshv2.c:576
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Greška: Veličina poruke %d je prevelika\n"
 
-#: lib/sshv2.c:634 lib/sshv2.c:1119 lib/sshv2.c:1955 lib/sshv2.c:2049
-#: lib/sshv2.c:2137
+#: 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 "Greška: Veličina poruke %d sa servera je prevelika\n"
 
-#: lib/sshv2.c:640
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1283,12 +1413,12 @@ msgstr ""
 "Došlo je do greške pri početnoj postavci SSH povezivanja sa udaljenim "
 "serverom. Greška sa udaljenog servera sledi:\n"
 
-#: lib/sshv2.c:869
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Otvaram povezivanje SSH ka %s\n"
 
-#: lib/sshv2.c:962
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Uspešno sam se prijavio na server SSH %s\n"
@@ -1313,7 +1443,11 @@ msgstr "Dužina semena entropije:"
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Najveći broj bajtova za zasejavanje mašine SSL-a"
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1326,11 +1460,11 @@ msgstr ""
 "Tema = %s\n"
 "Greška %i:%s\n"
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Ne mogu da dobijem potvrdu od druge strane\n"
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1340,56 +1474,46 @@ msgstr ""
 "povezani (%s). Prekidam povezivanje.\n"
 
 # bug: should be "Cannot initialize (the) OpenSSL library"
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+#, fuzzy
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Ne mogu da pokrenem biblioteku OpenSSL\n"
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Greška pri učitavanju podrazumevanih potvrda SSL-a\n"
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Greška pri postavljanju spiska šifri (nema ispravnih šifri)\n"
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Greška: Mašina SSL-a nije početno postavljena\n"
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Greška pri uspostavljanju povezivanja SSL (objekat BIO)\n"
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Greška pri uspostavljanju povezivanja SSL (objekat SSL)\n"
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Greška sa potvrdom druge strane: %s\n"
 
-#: src/uicommon/gftpui.c:61
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Čekam %d sekundi do sledećeg ponovnog pokušaja povezivanja\n"
-
-#: src/uicommon/gftpui.c:72 src/gtk/chmod_dialog.c:74
-#: src/gtk/delete_dialog.c:89 src/gtk/transfer.c:213
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Operacija je poništena\n"
 
-#: src/uicommon/gftpui.c:146
-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 ""
-">. Ako imate pitanja, komentare, ili predloge o ovom programu, slobodno mi ih "
-"pošaljite epoštom. Najnovije vesti o gFTP-u uvek možete saznati na mojem "
-"vebmestu na adresi http://www.gftp.org/\n";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Čekam %d sekundi do sledećeg ponovnog pokušaja povezivanja\n"
 
-#: src/uicommon/gftpui.c:147
+#: 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 "
@@ -1399,75 +1523,75 @@ msgstr ""
 "COPYING. Ovo je slobodni softver, a vi ste pozvani da ga raspodelite pod "
 "izvesnim uslovima; za detalje, pogledajte datoteku COPYING\n"
 
-#: src/uicommon/gftpui.c:149 src/gtk/menu-items.c:495
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Preveli: Goran Rakić <gox devbase net> i Strahinja Radić <mr99164 alas matf "
 "bg.ac.yu>"
 
-#: src/uicommon/gftpui.c:196 src/uicommon/gftpui.c:238
-#: src/uicommon/gftpui.c:278 src/uicommon/gftpui.c:313
-#: src/uicommon/gftpui.c:348 src/uicommon/gftpui.c:383
-#: src/uicommon/gftpui.c:419 src/uicommon/gftpui.c:482
-#: src/uicommon/gftpui.c:563 src/uicommon/gftpui.c:828
+#: 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 "Greška: Nisam povezan sa udaljenim mestom\n"
 
-#: src/uicommon/gftpui.c:207
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "upotreba: chmod <režim> <datoteka>\n"
 
-#: src/uicommon/gftpui.c:248
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "upotreba: rename <staro ime> <novo ime>\n"
 
-#: src/uicommon/gftpui.c:284
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "upotreba: delete <datoteka>\n"
 
-#: src/uicommon/gftpui.c:319
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "upotreba: rmdir <direktorijum>\n"
 
-#: src/uicommon/gftpui.c:354
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "upotreba: site <site naredba>\n"
 
-#: src/uicommon/gftpui.c:389
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "upotreba: mkdir <novi direktorijum>\n"
 
-#: src/uicommon/gftpui.c:425 src/uicommon/gftpui.c:442
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "upotreba: chdir <direktorijum>\n"
 
-#: src/uicommon/gftpui.c:514
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Neispravan argument\n"
 
-#: src/uicommon/gftpui.c:527
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Očisti ostavu direktorijuma\n"
 
-#: src/uicommon/gftpui.c:616
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "upotreba: open "
 
-#: src/uicommon/gftpui.c:691
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "upotreba: set [promenljiva = vrednost]\n"
 
-#: src/uicommon/gftpui.c:705
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Greška: Promenljiva %s nije ispravna promenljiva podešavanja.\n"
 
-#: src/uicommon/gftpui.c:712
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Greška: promenljiva %s nije dostupna u tekstualnoj verziji gFTP-a\n"
 
-#: src/uicommon/gftpui.c:792
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1475,305 +1599,326 @@ msgstr ""
 "Podržane naredbe:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:835
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "upotreba: %s <maska>\n"
 
-#: src/uicommon/gftpui.c:920
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "o programu"
 
-#: src/uicommon/gftpui.c:921
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Prikaži podatke o gFTP-u"
 
-#: src/uicommon/gftpui.c:922
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: src/uicommon/gftpui.c:923
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Postavlja režim prenosa trenutne datoteke na Ascii (samo za FTP)"
 
-#: src/uicommon/gftpui.c:924
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: src/uicommon/gftpui.c:925
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Postavlja režim prenosa trenutne datoteke na „binarno“ (samo za FTP)"
 
-#: src/uicommon/gftpui.c:926
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: src/uicommon/gftpui.c:927 src/uicommon/gftpui.c:929
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Menja udaljeni radni direktorijum"
 
-#: src/uicommon/gftpui.c:928
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: src/uicommon/gftpui.c:930
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: src/uicommon/gftpui.c:931
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Menja dozvole udaljenih datoteka"
 
-#: src/uicommon/gftpui.c:932
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: src/uicommon/gftpui.c:933
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Dostupne mogućnosti: ostava"
 
-#: src/uicommon/gftpui.c:934
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: src/uicommon/gftpui.c:935
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Prekida povezivanje sa udaljenim mestom"
 
-#: src/uicommon/gftpui.c:936
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Uklanja udaljenu datoteku"
 
-#: src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "chdir"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "Prikazuje spisak direktorijuma trenutnog udaljenog direktorijuma"
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "preuzmi"
 
-#: src/uicommon/gftpui.c:939 src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Preuzima udaljene datoteke"
 
-#: src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Prikazuje ovaj prozor pomoći"
 
-#: src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: src/uicommon/gftpui.c:943 src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Menja lokalni radni direktorijum"
 
-#: src/uicommon/gftpui.c:944
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Menja privilegije lokalnih datoteka"
 
-#: src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Uklanja lokalnu datoteku"
 
-#: src/uicommon/gftpui.c:950
-msgid "lls"
-msgstr "lls"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
 
-#: src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Prikazuje spisak direktorijuma trenutnog lokalnog direktorijuma"
 
-#: src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:971
+msgid "lls"
+msgstr "lls"
+
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Stvara lokalni direktorijum"
 
-#: src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Prikazuje trenutni lokalni direktorijum"
 
-#: src/uicommon/gftpui.c:956
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Preimenuje lokalnu datoteku"
 
-#: src/uicommon/gftpui.c:958
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Uklanja lokalni direktorijum"
 
-#: src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: src/uicommon/gftpui.c:961
-msgid "Shows the directory listing for the current remote directory"
-msgstr "Prikazuje spisak direktorijuma trenutnog udaljenog direktorijuma"
-
-#: src/uicommon/gftpui.c:962
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Stvara udaljeni direktorijum"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: src/uicommon/gftpui.c:967 src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Šalje lokalnu datoteku(e)"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Otvara povezivanje sa udaljenim mestom"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Prikazuje trenutni udaljeni direktorijum"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Izlaz iz gFTP-a"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Preimenuje udaljenu datoteku"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Uklanja udaljeni direktorijum"
 
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Prikazuje promenljive iz datoteke sa podešavanjima. Možete postaviti "
 "promenljive i pomoću set prom=vred"
 
-#: src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Unesite naredbu isključivu za ovo mesto"
 
-#: src/uicommon/gftpui.c:1074
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Greška: Naredba nije prepoznata\n"
 
-#: src/uicommon/gftpui.c:1324
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-"Greška: Udaljeno mesto je prekinulo vezu nakon pokušaja prenosa datoteke\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Uspešno preneo %s na %.2f KB/s\n"
 
-#: src/uicommon/gftpui.c:1390
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Preskačem datoteku %s na domaćinu %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Zaustavljam prenos na domaćinu %s\n"
+
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Nisam mogao da preuzmem %s sa %s\n"
 
-#: src/uicommon/gftpui.c:1413
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Uspešno preneo %s na %.2f KB/s\n"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:194 src/gtk/gftp-gtk.c:1009
-#: src/gtk/misc-gtk.c:478 src/gtk/misc-gtk.c:486
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr ""
 "%s: Molim vas da pritisnete dugme ‘zaustavi’ pre nego što uradite bilo šta "
 "drugo\n"
 
-#: src/gtk/bookmarks.c:40
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Pokreni obeleživač"
 
-#: src/gtk/bookmarks.c:70
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Dodavanje obeleživača: Morate uneti naziv obeleživača\n"
 
-#: src/gtk/bookmarks.c:77
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Dodavanje obeleživača: Ne mogu da dodam obeleživač %s jer taj naziv već "
 "postoji\n"
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Dodaj obeleživač"
 
-#: src/gtk/bookmarks.c:141
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Dodavanje obeleživača: Morate uneti ime domaćina\n"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1783,135 +1928,139 @@ msgstr ""
 "Možete razdvojiti stavke znakom ‘/’ kako biste napravili podmeni\n"
 "(npr: GNU-ova mesta/Debian)"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Zapamti lozinku"
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Dodavanje obeleživača: Morate uneti naziv obeleživača\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Nova fascikla"
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Unesite ime nove fascikle koju želite da stvorite"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Datoteka/Nova stavka..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Unesite ime nove stavke koju želite da stvorite"
 
-#: src/gtk/bookmarks.c:555
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Da li ste sigurni da želite da obrišete obeleživač\n"
 "%s i sve njegove potomke?"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Obriši obeleživač"
 
-#: src/gtk/bookmarks.c:583
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Obeleživači"
 
-#: src/gtk/bookmarks.c:823 src/gtk/bookmarks.c:826
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Uredi stavku"
 
-#: src/gtk/bookmarks.c:863
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/gtk/bookmarks.c:878
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Ime domaćina:"
 
-#: src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gtk/bookmarks.c:908
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtk/bookmarks.c:932
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Udaljeni direktorijum:"
 
-#: src/gtk/bookmarks.c:945
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokalni direktorijum:"
 
-#: src/gtk/bookmarks.c:962
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: src/gtk/bookmarks.c:975 src/text/textui.c:82
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/gtk/bookmarks.c:989
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Nalog:"
 
-#: src/gtk/bookmarks.c:1003
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Prijavi se kao ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1029 src/gtk/bookmarks.c:1273
-#: src/gtk/chmod_dialog.c:293 src/gtk/gtkui_transfer.c:373
-#: src/gtk/options_dialog.c:1120 src/gtk/options_dialog.c:1322
-msgid "  Cancel  "
-msgstr "  Poništi  "
-
-#: src/gtk/bookmarks.c:1039 src/gtk/options_dialog.c:1333
-msgid "Apply"
-msgstr "Primeni"
-
-#: src/gtk/bookmarks.c:1189
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/gtk/bookmarks.c:1190
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Datoteka/tearoff"
 
-#: src/gtk/bookmarks.c:1191
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Datoteka/Nova fascikla..."
 
-#: src/gtk/bookmarks.c:1192
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Datoteka/Nova stavka..."
 
-#: src/gtk/bookmarks.c:1193
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Datoteka/Obriši"
 
-#: src/gtk/bookmarks.c:1194
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Datoteka/Osobine..."
 
-#: src/gtk/bookmarks.c:1195
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Datoteka/sep"
 
-#: src/gtk/bookmarks.c:1196
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Datoteka/Zatvori"
 
-#: src/gtk/bookmarks.c:1207 src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Uredi obeleživače"
 
-#: src/gtk/chmod_dialog.c:160 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1919,78 +2068,96 @@ msgstr ""
 "Sada možete podesiti atribute vaših datoteka\n"
 "Napomena: Ne podržavaju svi serveri ftp odliku chmod"
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Posebno"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Lepljivo"
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:693
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Korisnik"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Čitanje"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Pisanje"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Izvršavanje"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:694
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupa"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Ostali"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr ""
 "Da li ste sigurni da želite da obrišete ovih %ld datoteka(e) i %ld "
 "direktorijum(a)"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr ""
+"Da li ste sigurni da želite da obrišete ovih %ld datoteka(e) i %ld "
+"direktorijum(a)"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr ""
+"Da li ste sigurni da želite da obrišete ovih %ld datoteka(e) i %ld "
+"direktorijum(a)"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Obriši datoteke/direktorijume"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1194
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gtk/dnd.c:146 src/gtk/dnd.c:233
-msgid "Drag-N-Drop"
-msgstr "Prevuci-i-pusti"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "Poveži se"
 
-#: src/gtk/dnd.c:255
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Primljen URL %s\n"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "Prevuci-i-pusti"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Izađi"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1998,465 +2165,511 @@ msgstr ""
 "Neki prenosi su u toku.\n"
 "Da li ste sigurni da želite da izađete?"
 
-#: src/gtk/gftp-gtk.c:179
-msgid "Connect via URL"
-msgstr "Poveži se koristeći adresu"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Mogućnosti"
 
-#: src/gtk/gftp-gtk.c:179
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Unesite adresu za povezivanje"
 
-#: src/gtk/gftp-gtk.c:195
-msgid "OpenURL"
-msgstr "Otvori adresu"
-
-#: src/gtk/gftp-gtk.c:218
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Prozor 1"
 
-#: src/gtk/gftp-gtk.c:221
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Prozor 2"
 
-#: src/gtk/gftp-gtk.c:222 src/gtk/gftp-gtk.c:225 src/gtk/gftp-gtk.c:228
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Aski"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Binarno"
 
-#: src/gtk/gftp-gtk.c:226
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Mogućnosti..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Datoteka/Osobine..."
 
-#: src/gtk/gftp-gtk.c:229
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Izađi"
 
-#: src/gtk/gftp-gtk.c:230
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokalno"
 
-#: src/gtk/gftp-gtk.c:231
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokalno/tearoff"
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokalno/Otvori _URL..."
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokalno/Prekini povezivanje"
 
-#: src/gtk/gftp-gtk.c:234 src/gtk/gftp-gtk.c:240
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokalno/sep"
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokalno/Promeni masku datoteka..."
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokalno/Prikaži označene"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokalno/Označi sve"
 
-#: src/gtk/gftp-gtk.c:238
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokalno/Označi sve datoteke"
 
-#: src/gtk/gftp-gtk.c:239
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokalno/Odznači sve"
 
-#: src/gtk/gftp-gtk.c:241
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalno/Sačuvaj spisak direktorijuma..."
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalno/Pošalji naredbu „SITE“..."
 
-#: src/gtk/gftp-gtk.c:243
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokalno/Promeni direktorijum"
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Lokalno/Chmod..."
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Local/Make Directory..."
-msgstr "/Lokalno/Napravi direktorijum..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Datoteka/Nova fascikla..."
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Lokalno/Preimenuj..."
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Lokalno/Obriši..."
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Lokalno/Uredi..."
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Lokalno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:250
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Lokalno/Osveži"
 
-#: src/gtk/gftp-gtk.c:251
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Udaljeno"
 
-#: src/gtk/gftp-gtk.c:252
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Udaljeno/tearoff"
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Udaljeno/Otvori _URL.."
 
-#: src/gtk/gftp-gtk.c:255
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Udaljeno/Prekini povezivanje"
 
-#: src/gtk/gftp-gtk.c:257 src/gtk/gftp-gtk.c:263
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Udaljeno/sep"
 
-#: src/gtk/gftp-gtk.c:258
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Udaljeno/Promeni masku datoteka..."
 
-#: src/gtk/gftp-gtk.c:259
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Udaljeno/Prikaži označene"
 
-#: src/gtk/gftp-gtk.c:260
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Udaljeno/Označi sve"
 
-#: src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Udaljeno/Označi sve datoteke"
 
-#: src/gtk/gftp-gtk.c:262
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Udaljeno/Odznači sve"
 
-#: src/gtk/gftp-gtk.c:264
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Udaljeno/Sačuvaj spisak direktorijuma..."
 
-#: src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Udaljeno/Pošalji naredbu „SITE“..."
 
-#: src/gtk/gftp-gtk.c:266
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Udaljeno/Promeni direktorijum"
 
-#: src/gtk/gftp-gtk.c:267
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Udaljeno/Chmod..."
 
-#: src/gtk/gftp-gtk.c:268
-msgid "/Remote/Make Directory..."
-msgstr "/Udaljeno/Napravi direktorijum"
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Datoteka/Nova fascikla..."
 
-#: src/gtk/gftp-gtk.c:269
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Udaljeno/Preimenuj"
 
-#: src/gtk/gftp-gtk.c:270
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Udaljeno/Obriši"
 
-#: src/gtk/gftp-gtk.c:271
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Udaljeno/Uredi..."
 
-#: src/gtk/gftp-gtk.c:272
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Udaljeno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Udaljeno/Osveži"
 
-#: src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Obeleživači"
 
-#: src/gtk/gftp-gtk.c:275
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Obeleživači/tearoff"
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Obeleživači/Dodaj obeleživač"
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Obeleživači/Uredi obeleživače"
 
-#: src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Obeleživači/sep"
 
-#: src/gtk/gftp-gtk.c:280
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Prenosi"
 
-#: src/gtk/gftp-gtk.c:281
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Prenosi/tearoff"
 
-#: src/gtk/gftp-gtk.c:282
-msgid "/Transfers/Start Transfer"
-msgstr "/Prenosi/Pokreni prenos"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Prenosi/tearoff"
 
-#: src/gtk/gftp-gtk.c:283
-msgid "/Transfers/Stop Transfer"
-msgstr "/Prenosi/Zaustavi prenos"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Prenosi/sep"
 
-#: src/gtk/gftp-gtk.c:285 src/gtk/gftp-gtk.c:293
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Prenosi/sep"
 
-#: src/gtk/gftp-gtk.c:286
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Prenosi/Preskoči trenutnu datoteku"
 
-#: src/gtk/gftp-gtk.c:287
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Prenosi/Ukloni datoteku"
 
-#: src/gtk/gftp-gtk.c:289
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Prenosi/Premesti datoteku _naviše"
 
-#: src/gtk/gftp-gtk.c:291
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Prenosi/Premesti datoteku nani_že"
 
-#: src/gtk/gftp-gtk.c:294
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Prenosi/Preuzmi datoteke"
 
-#: src/gtk/gftp-gtk.c:295
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Prenosi/Pošalji datoteke"
 
-#: src/gtk/gftp-gtk.c:296
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/_Dnevnik"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Dnevnik/tearoff"
 
-#: src/gtk/gftp-gtk.c:298
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Dnevnik/Očisti"
 
-#: src/gtk/gftp-gtk.c:299
-msgid "/Logging/View log..."
-msgstr "/Dnevnik/Pregledaj dnevnik..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Lokalno/Pregledaj..."
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Dnevnik/Snimi dnevnik..."
 
-#: src/gtk/gftp-gtk.c:301
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/Al_ati"
 
-#: src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Alati/tearoff"
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Alati/Uporedi prozore"
 
-#: src/gtk/gftp-gtk.c:304
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Alati/Očisti ostavu"
 
-#: src/gtk/gftp-gtk.c:305
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/_Pomoć"
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Pomoć/tearoff"
 
-#: src/gtk/gftp-gtk.c:307
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Pomoć/O programu..."
 
-#: src/gtk/gftp-gtk.c:425
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "Domaćin:"
 
-#: src/gtk/gftp-gtk.c:443
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port:"
 
-#: src/gtk/gftp-gtk.c:461
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "Korisnik:"
 
-#: src/gtk/gftp-gtk.c:479
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Lozinka:"
 
-#: src/gtk/gftp-gtk.c:548
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Naredba: "
 
-#: src/gtk/gftp-gtk.c:691 src/gtk/gftp-gtk.c:898 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: src/gtk/gftp-gtk.c:692
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Veličina"
 
-#: src/gtk/gftp-gtk.c:695
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: src/gtk/gftp-gtk.c:696
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Atributi"
 
-#: src/gtk/gftp-gtk.c:899
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Progres"
 
-#: src/gtk/gftp-gtk.c:1010 src/gtk/misc-gtk.c:891 src/gtk/misc-gtk.c:965
-msgid "Connect"
-msgstr "Poveži se"
-
-#: src/gtk/gftp-gtk.c:1040
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Greška: Morate uneti domaćina sa kojim želite da se povežete\n"
 
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/gtk/gtkui.c:93
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Unesite korisničko ime"
 
-#: src/gtk/gtkui.c:94
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Unesite korisničko ime za ovo mesto"
 
-#: src/gtk/gtkui.c:115 src/gtk/transfer.c:508 src/gtk/transfer.c:519
-msgid "Enter Password"
-msgstr "Unesite lozinku"
-
-#: src/gtk/gtkui.c:116 src/gtk/transfer.c:509 src/gtk/transfer.c:520
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Molimo vas da unesete lozinku za ovo mesto"
 
-#: src/gtk/gtkui.c:272
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Operacija je poništena...morate uneti nisku\n"
 
-#: src/gtk/gtkui.c:310
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Pravljenje direktorijuma"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Unesite naziv direktorijuma koji želite da stvorite"
 
-#: src/gtk/gtkui.c:336 src/gtk/gtkui.c:348 src/gtk/misc-gtk.c:894
-#: src/gtk/misc-gtk.c:968
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/gtk/gtkui.c:346
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "U šta želite da preimenujete %s?"
 
-#: src/gtk/gtkui.c:368 src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Mesto"
 
-#: src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Unesite naredbu isključivu za ovo mesto"
 
-#: src/gtk/gtkui.c:409 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr ""
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:403 src/gtk/transfer.c:486
-#: src/gtk/transfer.c:963
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Preskočeno"
 
-#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:465 src/gtk/transfer.c:490
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:299
-#: src/gtk/gtkui_transfer.c:326
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:305
-#: src/gtk/gtkui_transfer.c:332
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Nastavi"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:302
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Preskoči"
 
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Akcija"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:92
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Prenos datoteka"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2464,59 +2677,59 @@ msgstr ""
 "Sledeće datoteke postoje i na lokalnom i na udaljenom računaru\n"
 "Molim vas da odaberete šta želite da uradite"
 
-#: src/gtk/gtkui_transfer.c:308
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Greška"
 
-#: src/gtk/gtkui_transfer.c:338
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Preskoči datoteku"
 
-#: src/gtk/gtkui_transfer.c:348
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Označi sve"
 
-#: src/gtk/gtkui_transfer.c:354
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Odznači sve"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Promena maske datoteka: Operacija je poništena...morate uneti nisku\n"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Promeni masku datoteka"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Unesite novu masku datoteka"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:371
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:143
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Greška: Ne mogu da otvorim %s za upis: %s\n"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Sačuvaj spisak direktorijuma"
 
-#: src/gtk/menu-items.c:337 src/gtk/menu-items.c:395
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Greška: Greška prilikom upisa u %s: %s\n"
 
-#: src/gtk/menu-items.c:406
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Uspešno sam zapisao datoteku dnevnika %s\n"
 
-#: src/gtk/menu-items.c:418
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Sačuvaj dnevnik"
 
-#: src/gtk/menu-items.c:454
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2525,17 +2738,16 @@ msgstr ""
 "Ne mogu da pronađem datoteku ugovora o licenciranju COPYING. Molim vas da "
 "obezbedite da se ona nalazi u %s ili u %s"
 
-#: src/gtk/menu-items.c:458 src/gtk/menu-items.c:463
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "O programu gFTP"
 
-#: src/gtk/menu-items.c:494
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Sva prava zadržana (C) 1998–2003 Brajan Mesni (Brian Masney) <masneyb gftp "
@@ -2543,88 +2755,79 @@ msgstr ""
 "Zvanična domaća strana: http://www.gftp.org/\n";
 "Grb je napravio: Aron Vorli (Aaron Worley) <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:506
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "O programu"
 
-#: src/gtk/menu-items.c:555
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Ugovor o licenciranju"
 
-#: src/gtk/menu-items.c:561 src/gtk/view_dialog.c:392
-msgid "  Close  "
-msgstr "  Zatvori  "
-
-#: src/gtk/menu-items.c:643
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Uporedi prozore"
 
-#: src/gtk/misc-gtk.c:287
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "Prekida povezivanje sa udaljenim mestom"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: src/gtk/misc-gtk.c:294
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Ostavljeno) ["
 
-#: src/gtk/misc-gtk.c:319
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Nisam povezan"
 
-#: src/gtk/misc-gtk.c:405
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Greška prilikom otvaranja datoteke %s: %s\n"
 
-#: src/gtk/misc-gtk.c:494
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Nisam povezan sa udaljenim mestom\n"
 
-#: src/gtk/misc-gtk.c:501
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Ova mogućnost nije dostupna uz ovaj protokol\n"
 
-#: src/gtk/misc-gtk.c:509
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Morate imati izabranu samo jednu stavku\n"
 
-#: src/gtk/misc-gtk.c:516
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Motate imati izabranu najmanje jednu stavku\n"
 
-#: src/gtk/misc-gtk.c:888 src/gtk/misc-gtk.c:962
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Promeni"
 
-#: src/gtk/misc-gtk.c:959 src/gtk/options_dialog.c:1180
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/gtk/misc-gtk.c:985
-msgid "Cancel"
-msgstr "Poništi"
-
-#: src/gtk/misc-gtk.c:1055
-msgid "  Yes  "
-msgstr "  Da  "
-
-#: src/gtk/misc-gtk.c:1065
-msgid "  No  "
-msgstr "  Ne  "
-
-#: src/gtk/misc-gtk.c:1124
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Dobavljam spiskove direktorijuma"
 
-#: src/gtk/misc-gtk.c:1144
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Zaustavi  "
 
-#: src/gtk/misc-gtk.c:1154
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2633,40 +2836,51 @@ msgstr ""
 "Primljeno %ld direktorijum(a)\n"
 "i %ld datoteka(e)"
 
-#: src/gtk/misc-gtk.c:1228
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Greška gFTP-a: Ne mogu da pronađem datoteku %s u %s ili %s\n"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Uređivanje domaćina"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Dodavanje domaćina"
 
-#: src/gtk/options_dialog.c:952 src/gtk/options_dialog.c:1043
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domen"
 
-#: src/gtk/options_dialog.c:972
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "Mrežna adresa"
 
-#: src/gtk/options_dialog.c:1005 src/gtk/options_dialog.c:1145
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "Mrežnamaska"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "Domen"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "Mrežnamaska"
 
-#: src/gtk/options_dialog.c:1151
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokalni domaćini"
 
-#: src/gtk/options_dialog.c:1187 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Uredi"
-
-#: src/gtk/options_dialog.c:1249 src/gtk/options_dialog.c:1254
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Mogućnosti"
 
@@ -2674,35 +2888,40 @@ msgstr "Mogućnosti"
 msgid "Receiving file names..."
 msgstr "Primam nazive datoteka..."
 
-#: src/gtk/transfer.c:62 src/gtk/transfer.c:639
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Povezujem se..."
 
-#: src/gtk/transfer.c:100
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Preuzimanje datoteka: Nisam povezan sa udaljenim mestom\n"
 
-#: src/gtk/transfer.c:315
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Greška: Dete %d je vratilo %d\n"
 
-#: src/gtk/transfer.c:318
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Dete %d se uspešno vratilo\n"
 
-#: src/gtk/transfer.c:325
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "Greška: Dete %d je vratilo %d\n"
+
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Greška: Ne mogu da saznam informacije o datoteci %s: %s\n"
 
-#: src/gtk/transfer.c:330
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Datoteka %s nije promenjena\n"
 
-#: src/gtk/transfer.c:338
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2711,119 +2930,233 @@ msgstr ""
 "Datoteka %s je promenjena.\n"
 "Da li želite da je pošaljete?"
 
-#: src/gtk/transfer.c:341
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Uredi datoteku"
 
-#: src/gtk/transfer.c:406
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Završeno"
 
-#: src/gtk/transfer.c:446
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Zaustavi prenos %s\n"
-
-#: src/gtk/transfer.c:683
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr ""
-"%d%% završeno, %02d:%02d:%02d je procenjeno preostalo. (Datoteka %ld od %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "Primlj %s od %s pri %.2fKB/s, %02d:%02d:%02d je procenjeno preostalo"
 
-#: src/gtk/transfer.c:713
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Primlj %s od %s pri %.2fKB/s, %02d:%02d:%02d je procenjeno preostalo"
 
-#: src/gtk/transfer.c:722
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "Primlj %s od %s, prenos je zastao, neznano vremena je preostalo"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Primlj %s od %s, prenos je zastao, neznano vremena je preostalo"
 
-#: src/gtk/transfer.c:757
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
+
+#: src/gtk/transfer.c:804
+#, c-format
+msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+msgstr ""
+"%d%% završeno, %02d:%02d:%02d je procenjeno preostalo. (Datoteka %ld od %ld)"
+
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Dobavljam imena datoteka...%s bajtova"
 
-#: src/gtk/transfer.c:835 src/gtk/transfer.c:857 src/gtk/transfer.c:891
-#: src/gtk/transfer.c:931 src/gtk/transfer.c:984 src/gtk/transfer.c:1044
+#: 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 "Nema izabranih prenosa datoteka\n"
 
-#: src/gtk/transfer.c:875
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Zaustavljam prenos na domaćinu %s\n"
-
-#: src/gtk/transfer.c:916 src/gtk/transfer.c:969
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Preskačem datoteku %s na domaćinu %s\n"
-
-#: src/gtk/view_dialog.c:36
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Pregledaj"
 
-#: src/gtk/view_dialog.c:48
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Uredi"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Pregled: %s je direktorijum. Ne mogu da ga pregledam.\n"
 
-#: src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Uređivanje: Morate zadati uređivač u dijalogu mogućnosti\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 "Uređivanje: %s je direktorijum. Ne mogu da ga uređujem.\n"
 
-#: src/gtk/view_dialog.c:198
+#: src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "Uređivanje: Morate zadati uređivač u dijalogu mogućnosti\n"
+
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Pregled: Ne mogu da podelim proces: %s\n"
 
-#: src/gtk/view_dialog.c:201
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Pokrećem program: %s %s\n"
 
-#: src/gtk/view_dialog.c:259
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Otvaram %s preko %s\n"
 
-#: src/gtk/view_dialog.c:294
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Pregledam datoteku %s\n"
 
-#: src/gtk/view_dialog.c:301
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Pregled: Ne mogu da otvorim datoteku %s: %s\n"
 
-#: src/text/gftp-text.c:169
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Ne mogu da otvorim upravljački terminal %s\n"
 
-#: src/text/textui.c:70
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Korisničko ime [anonymous]:"
 
 # bug: *BAD* for translation!
-#: src/text/textui.c:139
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s već postoji. (izvorna veličina %s, odredišna veličina %s):\n"
 "(o)presnimi, (r)nastavi, (s)preskoči, (O)presnimi sve, (R)nastavi sve, (S)"
 "preskoči sve: (%c)"
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Početni direktorijum:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Podrazumevani direktorijum u kome će gFTP biti po pokretanju"
+
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "Pokrećem prenos datoteke sa pomerajem %lld\n"
+
+#~ msgid "SSH2 sftp-server path:"
+#~ msgstr "SSH2 sftp-server putanja:"
+
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "Podrazumevana putanja udaljenog SSH2 servera sftp"
+
+#~ msgid "Use ssh-askpass utility"
+#~ msgstr "Koristi alat ssh-askpass"
+
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "Koristi ssh-askpass alat za pribavljanje lozinke korisnika"
+
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "Koristi podsistem SSH2 - SFTP"
+
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "Pozivaj ssh sa prekidačem -s sftp. Ovo je korisno jer ne morate da znate "
+#~ "putanju do udaljenog servera sftp"
+
+#~ msgid "WARNING"
+#~ msgstr "UPOZORENjE"
+
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "Molim vas da se povežete sa ovim domaćinom koristeći program SSH iz "
+#~ "komandne linije i prikladno odgovorite na ovo pitanje.\n"
+
+#~ msgid "Please correct the above warning to connect to this host.\n"
+#~ msgstr ""
+#~ "Molim vas da ispravite gornje upozorenje da biste se povezali sa ovim "
+#~ "domaćinom.\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 ""
+#~ ">. Ako imate pitanja, komentare, ili predloge o ovom programu, slobodno "
+#~ "mi ih pošaljite epoštom. Najnovije vesti o gFTP-u uvek možete saznati na "
+#~ "mojem vebmestu na adresi http://www.gftp.org/\n";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Greška: Udaljeno mesto je prekinulo vezu nakon pokušaja prenosa datoteke\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Poništi  "
+
+#~ msgid "Apply"
+#~ msgstr "Primeni"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Poveži se koristeći adresu"
+
+#~ msgid "OpenURL"
+#~ msgstr "Otvori adresu"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Mogućnosti..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Lokalno/Napravi direktorijum..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Udaljeno/Napravi direktorijum"
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Prenosi/Pokreni prenos"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Prenosi/Zaustavi prenos"
+
+#~ msgid "/Logging/View log..."
+#~ msgstr "/Dnevnik/Pregledaj dnevnik..."
+
+#~ msgid "  Close  "
+#~ msgstr "  Zatvori  "
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Cancel"
+#~ msgstr "Poništi"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Da  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ne  "
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Zaustavi prenos %s\n"
+
 #~ msgid "Received invalid response to PWD command: '%s'\n"
 #~ msgstr "Primio sam neispravan odziv na PWD komandu: ‘%s’\n"
 
@@ -2881,8 +3214,8 @@ msgstr ""
 #~ "server response\n"
 #~ msgstr ""
 #~ "Primio sam pogrešan odgovor servera, prekidam povezivanje\n"
-#~ "Očekujem „carriage return“ i „line feed“ posle veličine odeljka u odgovoru "
-#~ "servera\n"
+#~ "Očekujem „carriage return“ i „line feed“ posle veličine odeljka u "
+#~ "odgovoru servera\n"
 
 #~ msgid "Local Size"
 #~ msgstr "Lokalna veličina"
@@ -2912,8 +3245,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Unutrašnja greška gFTP-a: Ne mogu da pronađem obeleživač. Ovo je "
 #~ "najverovatnije greška. Molim da pošaljete epismo o tome na masneyb gftp "
-#~ "org. Molim vas da uključite broj verzije gFTP-a i podatke kako je došlo do "
-#~ "greške\n"
+#~ "org. Molim vas da uključite broj verzije gFTP-a i podatke kako je došlo "
+#~ "do greške\n"
 
 #~ msgid "Error: You cannot change this variable\n"
 #~ msgstr "Greška: Ne možete da promenite ovu promenljivu\n"
@@ -3002,12 +3335,5 @@ msgstr ""
 #~ msgid "Send PASV command or PORT command for data transfers"
 #~ msgstr "Pošalji naredbe PASV ili PORT pri prenosu podataka"
 
-#~ msgid "Automatically start the file transfers when they get queued?"
-#~ msgstr ""
-#~ "Da automatski pokrenem prenose datoteka pri dodavanju u red za čekanje?"
-
-#~ msgid "Start file transfers"
-#~ msgstr "Pokreni prenose datoteka"
-
 #~ msgid "Enter your email address here"
 #~ msgstr "Ovde unesite vašu eadresu"
diff --git a/po/sv.po b/po/sv.po
index fb42350..d0976d9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,90 +10,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gFTP\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 11:01+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2007-03-24 10:38+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Ogiltig URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Fel: Raden %s i indexfilen för cacheminnet är ogiltig\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Fel: Kunde inte skapa katalogen %s: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Fel: Kan inte skapa temporärfil: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Fel när filidentifieraren skulle stängas: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Fel: Kan inte söka på filen %s: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3200
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Fel vid konvertering av strängen \"%s\" från teckenuppsättningen %s till "
+"teckenuppsättningen %s: %s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Fel: Kan inte öppna den lokala filen %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2901 ../lib/sslcommon.c:497
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Fel: Kunde inte skriva till uttag (socket): %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2823 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Fel: Kunde inte läsa från uttag (socket): %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-fel: Felaktigt bokmärkesfilnamn %s\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Varning: Kan inte hitta huvudbokmärkesfilen %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-fel: Kan inte öppna bokmärkesfilen %s: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP-varning: Hoppar över rad %d i bokmärkesfilen: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP-varning: Rad %d har inte tillräckligt många argument\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 "
@@ -103,7 +111,7 @@ msgstr ""
 "behöver gå via proxyservern (om sådan finns). Syntax: dont_use_proxy=.domän "
 "eller dont_use_proxy=IP-nummer/nätmask"
 
-#: ../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"
@@ -111,52 +119,52 @@ msgstr ""
 "ext=filändelse:XPM fil:Ascii eller binär (A eller B):läsprogram. Notera: "
 "Alla argument utom filändelsen är frivilliga"
 
-#: ../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-fel: Felaktigt konfigurationsfilnamn %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-fel: Kunde inte skapa katalogen %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-fel: Kan inte hitta huvudkonfigurationsfilen %s\n"
 
-#: ../lib/config_file.c:611
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Gjorde du en make install?\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-fel: Kan inte öppna konfigurationsfilen %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 "Avslutar på grund av tolkningsfel på rad %d i konfigurationsfilen\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-varning: Hoppar över rad %d i konfigurationsfilen: %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-fel: Felaktigt loggfilnamn %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-varning: Kan inte öppna %s för skrivning: %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"
@@ -165,7 +173,7 @@ msgstr ""
 "org>. Varning: Alla kommentarer som du skriver i denna fil KOMMER att "
 "skrivas över"
 
-#: ../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 "
@@ -177,7 +185,7 @@ msgstr ""
 "som står bakom dig och läser på skärmen när du redigerar denna fil. Innan "
 "detta lagrades alla lösenord i klartext."
 
-#: ../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. "
@@ -188,94 +196,95 @@ msgstr ""
 "skrivas över. Om en post har (*) i kommentaren kan du inte ändra den inne i "
 "gFTP"
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:391 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<okänd>"
 
-#: ../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 ""
 "ÖDESDIGERT gFTP-fel: Konfigurationsalternativet \"%s\" hittades inte i "
 "globala hashtabellen\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Fel: Kan inte skicka filen %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Fel: Kan inte skriva till filen %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Fel: Fel vid stängning av fil: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Trasig fillista från FSP-server %s\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1578
-#: ../lib/protocols.c:1579 ../lib/protocols.c:1620 ../lib/protocols.c:1621
-#: ../lib/protocols.c:1687 ../lib/protocols.c:1694 ../lib/protocols.c:1770
-#: ../lib/protocols.c:1771 ../lib/protocols.c:1807
+#: 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 "okänd"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Kunde inte få FSP-kataloglistan %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Ändring av katalog till %s lyckades\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kunde inte ändra katalog till %s\n"
 
-#: ../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:288
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s borttagen\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Fel: Kunde inte ta bort katalogen %s: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:292
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Fel: Kunde inte ta bort filen %s: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Skapade katalogen %s\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Ändrade namn från %s till %s\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Fel: Kunde inte byta namn från %s till %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"
@@ -283,7 +292,7 @@ msgstr ""
 "Stöd för FTPS inte tillgängligt eftersom stöd för SSL inte har byggts in. "
 "Avbryter anslutning.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -291,107 +300,105 @@ msgstr ""
 "Stöd för HTTPS inte tillgängligt eftersom stöd för SSL inte har byggts in. "
 "Avbryter anslutning.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Kunde inte avgöra aktuell arbetskatalog: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Ändrade lokal katalog till %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Kunde inte byta lokal katalog till %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Fel: Kan inte trunkera den lokala filen %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Kunde inte lista den lokala katalogen %s: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Ändring av attribut på %s till %o lyckades\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Fel: Kunde inte ändra attribut på %s till %o: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "Ändring av tidsstämpeln för %s lyckades\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Fel: Kunde inte ändra tidsstämpeln för %s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalt filsystem"
 
-#: ../lib/misc.c:407
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "användning: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "fil"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "storlek"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "användare"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grupp"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "datumtid"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "attribut"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "fallande"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "stigande"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Allmänt"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Visningsprogram:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -399,27 +406,27 @@ msgstr ""
 "Det program som används för att visa filer, om inget annat anges. Om raden "
 "lämnas tom används den interna visaren"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Redigeringsprogram:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Standardprogrammet för redigering av filer."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Maxstorlek för loggfönster:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maxstorlek för loggfönstret i antal byte för GTK+-versionen"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Fjärrteckenkodningar:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -427,11 +434,11 @@ msgstr ""
 "Detta är en kommaseparerad lista med teckenkodningar som fjärrmeddelanden "
 "ska försöka konverteras från till den aktuella lokalen"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Fjärr LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -439,190 +446,193 @@ msgstr ""
 "Detta är värdet för LC_TIME för fjärrsidan. Detta är för att datum ska kunna "
 "tolkas korrekt i kataloglistan."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Cache-TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Antalet sekunder som cacheposter skall behållas innan de går ut."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Lägg filöverföringar efter varandra"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Lägg nya filöverföringar efter de befintliga"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Gör en överföring i taget"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Bara göra en överföring i taget?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Skriv över som standard"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "Skriv över filer som standard eller återuppta påbörjade filöverföringar"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Bevara filrättigheter"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+msgid "Preserve file permissions of transferred files"
 msgstr "Bevara filrättigheter på överförda filer"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Bevara filtid"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Bevara filtider på överförda filer"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Uppdatera efter varje överföring"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Uppdatera fillistan efter varje filöverföring"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Sortera kataloger först"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Visa katalogerna först och sedan filerna"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Visa dolda filer"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Visa dolda filer i fillistorna"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Visa överföringsstatus på titelraden"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Visa filöverföringsstatus på titelraden"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Starta filöverföringar"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Starta filöverföringarna automatiskt när de läggs i kö"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Tillåt manuella kommandon i gränssnittet"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Tillåt inmatning av manuella kommandon i det grafiska gränsnittet "
 "(funktioner såsom textversionen)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Kom ihåg senaste katalogen"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Spara den senaste lokal- och fjärrkatalogen när programmet stängs"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Anslut till fjärrserver vid uppstart"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Anslut automatiskt till fjärrservern när programmet startas."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Nätverkstimeout:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Tidsgräns för att vänta på indata/utdata från nätverket. Det är INTE en "
 "inaktivitetstimeout."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Anslutningsomförsök:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Antalet automatiska anslutningsförsök. Ställ in till 0 för oändligt antal"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tid mellan anslutningsförsök:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Antal sekunder mellan anslutningsförsök"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max kB/s:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "Maxhastigheten i kB/s för filöverföringar. (Sätt till 0 för att inaktivera)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Blockstorlek för överföring:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Blockstorleken som används vid överföring av filer. Detta värde bör vara "
 "multiplicerbart med 1024."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Standardprotokoll:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Detta anger vilket standardprotokoll som ska användas"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Aktivera IPv6-stöd"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -630,27 +640,27 @@ msgstr ""
 "Det här definierar vad som händer om dubbelklickar på en fil i fillistan. "
 "0=Läs fil 1=Redigera fil 2=Överför fil"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Bredden på listan med lokala filer"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Bredden på listan med fjärrvärdens filer"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Standardhöjden för listan med lokala/fjärrvärdens filer"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Standardhöjden för överföringslistrutan"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Standardhöjden för loggfönstret"
 
-#: ../lib/options.h:177
+#: 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."
@@ -658,15 +668,15 @@ msgstr ""
 "Bredden på filnamskolumnen i överföringsfönstret. Sätt den till 0 för att få "
 "kolumnen att ändra storlek automagiskt."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Kolumnen att sortera efter som standard"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortera stigande eller fallande"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -674,7 +684,7 @@ msgstr ""
 "Bredden på filnamnskolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -682,7 +692,7 @@ msgstr ""
 "Bredden på storlekskolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -690,7 +700,7 @@ msgstr ""
 "Bredden på användarkolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -698,7 +708,7 @@ msgstr ""
 "Bredden på gruppkolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -706,7 +716,7 @@ msgstr ""
 "Bredden på datumkolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -714,251 +724,186 @@ msgstr ""
 "Bredden på attrubutkolumnen i fillistor. Sätt den till 0 för att få kolumnen "
 "att ändra storlek automagiskt. Sätt den till -1 för att inaktivera kolumnen"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Färgen på kommandona som skickas till servern"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Färgen på kommandona som tas emot från servern"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Färgen på felmeddelandena"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Färgen på resten av loggmeddelandena"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Lokalt"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Bokmärke"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:234
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Filöverföringar kommer att bli begränsade till %.2f kB/s\n"
 
-#: ../lib/protocols.c:387
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 "Fel vid inställning av LC_TIME till \"%s\". Faller tillbaka på \"%s\"\n"
 
-#: ../lib/protocols.c:398
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Läser in kataloglistan %s från cacheminnet (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:408
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Läser in kataloglistan %s från server (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:471
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Fel vid konvertering av strängen \"%s\" från teckenuppsättningen %s till "
-"teckenuppsättningen %s: %s\n"
-
-#: ../lib/protocols.c:696
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr ""
-"Varning: Klipper bort sökvägen från filen \"%s\". Den bortklippta sökvägen (%"
-"s) stämmer inte överens med aktuell katalog (%s)\n"
+"Varning: Klipper bort sökvägen från filen \"%s\". Den bortklippta sökvägen "
+"(%s) stämmer inte överens med aktuell katalog (%s)\n"
 
-#: ../lib/protocols.c:722
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Fel: Kan inte skriva till cache: %s\n"
 
-#: ../lib/protocols.c:755
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Fel: Kunde inte hitta bokmärket %s\n"
 
-#: ../lib/protocols.c:762
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Bokmärkesfel: Bokmärkesposten %s har inget värdnamn\n"
 
-#: ../lib/protocols.c:884 ../lib/protocols.c:911
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokollet \"%s\" stöds inte för tillfället.\n"
 
-#: ../lib/protocols.c:1201 ../lib/protocols.c:1216 ../lib/protocols.c:2398
-#: ../lib/protocols.c:2511
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Slår upp %s\n"
-
-#: ../lib/protocols.c:1207 ../lib/protocols.c:1222 ../lib/protocols.c:2403
-#: ../lib/protocols.c:2516
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Kan inte slå upp värdnamnet %s: %s\n"
-
-#: ../lib/protocols.c:2133
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Hittade rekursiv symbolisk länk %s\n"
 
-#: ../lib/protocols.c:2421
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Misslyckades med att skapa ett uttag (socket): %s\n"
-
-#: ../lib/protocols.c:2427 ../lib/protocols.c:2533
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Försöker med %s:%d\n"
-
-#: ../lib/protocols.c:2432 ../lib/protocols.c:2540
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Kan inte ansluta till %s: %s\n"
-
-#: ../lib/protocols.c:2470 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Misslyckades med att skapa ett IPv4-uttag: %s\n"
-
-#: ../lib/protocols.c:2494 ../lib/sshv2.c:1168
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "Kan inte slå upp tjänstnamnet %s/tcp. Kontrollera din services-fil\n"
-
-#: ../lib/protocols.c:2556 ../lib/protocols.c:3209 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Fel: Kan inte sätta stängning på exec-flaggan: %s\n"
-
-#: ../lib/protocols.c:2563
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Ansluten till %s:%d\n"
-
-#: ../lib/protocols.c:2799 ../lib/protocols.c:2876 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Anslutningen till %s gjorde time-out\n"
-
-#: ../lib/protocols.c:2946
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Kan inte skapa uttagsflaggor (socket flags): %s\n"
-
-#: ../lib/protocols.c:2960
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Kan inte sätta uttag (socket) till icke-blockerande: %s\n"
-
-#: ../lib/protocols.c:3106
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "Fel: Värden %s kopplade ner. Max antal försök uppnått... ger upp\n"
 
-#: ../lib/protocols.c:3114
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Fel: Värden %s kopplade ner. Nytt försök om %d sekunder\n"
 
-#: ../lib/pty.c:301
+#: lib/protocols.c:1634 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 "Fel: Kan inte sätta stängning på exec-flaggan: %s\n"
+
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Kan inte öppna huvud-pty %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kan inte skapa ett uttagspar (socket pair): %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Fel: Kan inte köra ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Kan inte grena en till process: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxyvärdnamn:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Brandväggsvärdnamn"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxyport:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port att ansluta till på brandväggen"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxyanvändarnamn:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Ditt brandväggsanvändarnamn"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxylösenord:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ditt brandväggslösenord"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Använd HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vill du använda HTTP/1.1 eller HTTP/1.0"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -967,65 +912,65 @@ msgstr ""
 "Fick felaktigt svar från servern, kopplar ner\n"
 "Ogiltig styckesstorlek \"%s\" returnerades från fjärrservern\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Kopplar ner från platsen %s\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Börjar filöverföringen vid position "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Kan inte hämta filen %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Tar emot kataloglistan... \n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Fick felaktigt svar från servern, kopplar ner\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE-kommando"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "användare värd"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "användare värd:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTENTISERA"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "användare värd port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "användare värd NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP-proxy"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1033,19 +978,19 @@ msgstr ""
 "Detta är det lösenord som kommer att användas när du loggar in som anonym på "
 "en FTP-fjärrserver"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Proxykonto:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Ditt brandväggskonto (valfritt)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Proxyservertyp:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1062,11 +1007,11 @@ msgstr ""
 "(användare), p (lösenord), h (värd), o (port) eller a (konto). För att ange "
 "proxyanvändaren anger du till exempel %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ignorera PASV-adress"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1078,11 +1023,11 @@ msgstr ""
 "behövs ofta för att routrar ger ut sin interna hellre än sin externa IP-"
 "adress in ett PASV-svar."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passiva filöverföringar"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1098,11 +1043,11 @@ msgstr ""
 "inaktiverat kommer gFTP att öppna upp en port på klientsidan och "
 "fjärrservern kommer att försöka ansluta till den."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Slå upp fjärrvärdens symboliska länkar (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1114,15 +1059,16 @@ msgstr ""
 "aktiverat. Det enda tillfället då du vill inaktivera detta är om FTP-"
 "fjärrservern inte stöder flaggan -L för LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Överför filer i ASCII-läge"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1131,273 +1077,324 @@ msgstr ""
 "nyrader i textfiler. Om du överför från UNIX till UNIX kan du lämna detta "
 "frånslaget. Om du hämtar binär data bör du inaktivera detta."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1422
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ogiltigt svar \"%c\" mottogs från server.\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Misslyckades med att skapa ett IPv4-uttag: %s\n"
+
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Kan inte hitta en IP-adress i PASV-svar \"%s\"\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 "Ignorerar IP-adress i PASV-svar, ansluter till %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 "Kan inte skapa en dataanslutning: %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 "Kan inte läsa uttagsnamn (socket name): %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 "Kan inte binda till port: %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 "Kan inte lyssna på port %d: %s\n"
 
-#: ../lib/rfc959.c:883
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Misslyckades med att skapa ett IPv6-uttag: %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 ""
 "Fel: Det verkar inte som om vi är anslutna via IPv6. Avbryter anslutning.\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 "Ogiltigt EPSV-svar \"%s\"\n"
 
-#: ../lib/rfc959.c:997
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kan inte få tag i adress för lokalt uttag: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kan inte ta emot anslutning från server: %s\n"
 
-#: ../lib/rfc959.c:1592
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "totalt"
 
-#: ../lib/rfc959.c:1594
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Varning: Kan inte tolka listan %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "Slår upp %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 "Kan inte slå upp värdnamnet %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Misslyckades med att skapa ett uttag (socket): %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "Försöker med %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 "Kan inte ansluta till %s: %s\n"
+
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Ansluten till %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 "Kan inte slå upp tjänstnamnet %s/tcp. Kontrollera din services-fil\n"
+
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Anslutningen till %s gjorde time-out\n"
+
+#: lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Kan inte skapa uttagsflaggor (socket flags): %s\n"
+
+#: lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Kan inte sätta uttag (socket) till icke-blockerande: %s\n"
+
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH-programnamn:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Sökvägen till SSH-programmet"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Extra SSH-parametrar:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Extra parametrar att skicka till SSH-programmet"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "Behöver SSH-användare/lösenord"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Kräver ett användarnamn/lösenord för SSH-anslutningar"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Kör programmet %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Ange nyckelfras för RSA-nyckel"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Ange lösenfras för nyckel \""
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "lösenord"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nej)?"
 
 # PASSCODE är en vaddå?
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Ange PASSCODE:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Ange SecurID-lösenord:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Fel: Ett felaktigt lösenord angavs\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protokollinitiering\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokollversion %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: Öppna %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Stäng\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Öppna katalogen %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Läs katalog\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Ta bort filen %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Skapa katalogen %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Ta bort katalogen %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Absolut sökväg %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Filattribut\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Ingen sådan fil eller katalog"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Åtkomst nekad"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Misslyckande"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Felaktigt meddelande"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Ingen anslutning"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Anslutningen avbruten"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Åtgärden stöds inte"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Okänt meddelande returnerades från servern"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Fel: Meddelandestorleken %d för stor\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Fel: Meddelandestorleken %d för stor från servern\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1405,41 +1402,41 @@ msgstr ""
 "Ett fel uppstod vid initiering av en SSH-anslutning med fjärrservern. "
 "Felmeddelandet från fjärrservern följer:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Öppnar SSH-anslutning till %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Lyckad inloggning till SSH-servern %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL-motor"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL-entropifil:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL-entropifil"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Längd på entropifrö:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Maximalt antal byte att ge som frö till SSL-motorn"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Validera SSL-motpunkt"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1452,11 +1449,11 @@ msgstr ""
 "Ämne = %s\n"
 "Fel %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Kan inte hämta certifikat för motpart\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 "
@@ -1465,56 +1462,45 @@ msgstr ""
 "FEL: Värden i SSL-certifikatet (%s) stämmer inte överens med värden som vi "
 "anslöt till (%s). Avbryter anslutning.\n"
 
-#: ../lib/sslcommon.c:306
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Kan inte initiera OpenSSL-biblioteket\n"
 
-#: ../lib/sslcommon.c:321
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Fel vid inläsning av SSL-standardcertifikat\n"
 
-#: ../lib/sslcommon.c:333
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Fel vid hämtning av chifferlista (inga giltiga chiffer)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Fel: SSL-motorn initerades inte\n"
 
-#: ../lib/sslcommon.c:370
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Fel vid upprättandet av SSL-anslutning (BIO-objekt)\n"
 
-#: ../lib/sslcommon.c:380
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Fel vid upprättandet av SSL-anslutning (SSL-objekt)\n"
 
-#: ../lib/sslcommon.c:401
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Fel med motpartens certifikat: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Åtgärden avbruten\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Väntar %d sekunder med att försöka igen\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 ""
-">. Om du har några frågor, kommentarer eller förslag om detta program är du "
-"välkommen att kontakta mig via e-post. Du hittar alltid de senaste nyheterna "
-"om gFTP på min hemsida http://www.gftp.org/ Skicka synpunkter på "
-"översättningen till tp-sv listor tp-sv se\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 "
@@ -1525,7 +1511,7 @@ msgstr ""
 "under särskilda villkor; för detaljer se filen COPYING\n"
 
 # Ska det se ut så här?
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Daniel Nylander\n"
@@ -1536,69 +1522,69 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "tp-sv listor tp-sv se"
 
-#: ../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 "Fel: Inte ansluten till en fjärrplats\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "användning: chmod <attribut> <fil>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "användning: rename <gammalt namn> <nytt namn>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "användning: delete <fil>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "användning: rmdir <katalog>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "användning: site <site-kommando>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "användning: mkdir <ny katalog>\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 "användning: chdir <katalog>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Ogiltigt argument\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Töm katalogcachen\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "användning: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "användning: set [variabel = värde]\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 "Fel: Variabeln %s är ingen giltig konfigurationsvariabel.\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 "Fel: Variabeln %s finns inte tillgänglig i textversionen av gFTP\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1606,288 +1592,288 @@ msgstr ""
 "Giltiga kommandon:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "användning: %s <filspec>\n"
 
 # Jag antar att about, ascii, cd, chmod, get, lcd, etc. är kommandon som egentligen inte bör översättas
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Visar gFTP-information"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Ställer in aktuellt överföringsläge till Ascii (gäller enbart FTP)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Ställer in aktuellt överföringsläge till binärt (gäller enbart FTP)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Byter arbetskatalog på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Ändrar rättigheterna på en fil på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Tillgängliga flaggor: cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Kopplar ner från fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Tar bort en fil på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Visar kataloglistan för den aktuella katalogen på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Hämtar fil(er) från fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Visar denna hjälpskärm"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Ändrar lokal arbetsmapp"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Ändrar rättigheterna på en lokal fil"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Tar bort en lokal fil"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Visar kataloglistan för den aktuella lokala katalogen"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Skapar en lokal katalog"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Visar aktuell lokal katalog"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Byta namn på en lokal fil"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Ta bort en lokal katalog"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Skapar en katalog på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Skickar lokala fil(er)"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Skapar en anslutning till en fjärrplats"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Visa aktuell fjärrkatalog"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Avsluta gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Byta namn på en fil på fjärrvärden"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Ta bort en fjärrkatalog"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Visa variabler för konfigurationsfil. Du kan också ange variabler med set "
 "var=värde"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "plats"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Kör ett platsspecifikt kommando"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Fel: Känner inte igen kommando\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Överförde %s med %.2f kB/s\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "Hoppar över filen %s på värden %s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "Stoppar överföringen på värden %s\n"
 
-#: ../src/uicommon/gftpui.c:1502
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Kunde inte hämta %s från %s\n"
 
-#: ../src/uicommon/gftpui.c:1558
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1896,37 +1882,36 @@ msgstr ""
 "Det var %d filer eller kataloger som inte kunde överföras. Kontrollera "
 "loggen för att se vilka objekt som inte överfördes korrekt."
 
-#: ../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/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Tryck på stoppknappen innan du gör något annat\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Kör bokmärke"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Lägg till bokmärke: Du måste ange ett namn för bokmärket\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Lägg till bokmärke: Kan inte lägga till bokmärket %s eftersom namnet redan "
 "finns\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Lägg till bokmärke"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Lägg till bokmärke: Du måste ange ett värdnamn\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1936,31 +1921,31 @@ msgstr ""
 "Du kan lägga in det i en undermeny med hjälp av /\n"
 "(T.ex. Linuxplatser/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Kom ihåg lösenord"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Du måste ange ett namn för bokmärket."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Ny mapp"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Ange namnet på den nya mappen"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Nytt objekt"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Ange namnet på det nya objektet"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1969,106 +1954,99 @@ msgstr ""
 "Är du säker på att du vill ta bort bokmärket\n"
 "%s och alla dess barn?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Ta bort bokmärke"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Redigera post"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Värd:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Fjärrkatalog:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Lokal katalog:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Logga in som ANONYM"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  Avbryt  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Arkiv/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Arkiv/Ny _mapp..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Arkiv/Nytt _objekt..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Arkiv/_Ta bort"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Arkiv/_Egenskaper..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Arkiv/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Arkiv/_Stäng"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Redigera bokmärken"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2076,91 +2054,90 @@ msgstr ""
 "Nu kan du anpassa attributen på din(a) fil(er)\n"
 "Notera: inte alla FTP-servrar stöder chmod-funktionen"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Special"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Klistrig (sticky)"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Användare"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Läsa"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Skriva"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Köra"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Övriga"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Är du säker på att du vill ta bort dessa %ld filer och %ld kataloger"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Är du säker på att du vill ta bort dessa %ld filer"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Är du säker på att du vill ta bort dessa %ld kataloger"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Ta bort filer/kataloger"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Tog emot URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Drag och släpp"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Avsluta"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2168,468 +2145,455 @@ msgstr ""
 "Det pågår filöverföringar.\n"
 "Är du säker på att du vill avsluta?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Öppna plats"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Ange en url att ansluta till"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Fönster _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Fönster _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binärt"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Inställningar..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/Av_sluta"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Lokalt"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Lokalt/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Lokalt/_Öppna plats..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Lokalt/Ko_ppla från"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Lokalt/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Lokalt/Byt _filfilter..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Lokalt/V_isa markerade"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Lokalt/Markera _alla"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Lokalt/Markera alla filer"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Lokalt/Avmarkera alla"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalt/Spara kataloglista..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalt/Skicka SITE-kommando..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Lokalt/Byt _katalog"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Lokalt/Rä_ttigheter..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Arkiv/_Ny mapp..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Lokalt/_Byt namn..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Lokalt/_Ta bort..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Lokalt/R_edigera..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Lokalt/_Visa..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Lokalt/_Uppdatera"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Fjärr"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Fjärr/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Fjärr/_Öppna plats..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Fjärr/Koppla f_rån"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Fjärr/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Fjärr/Byt _filfilter..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Fjärr/V_isa markerade"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Fjärr/Markera _alla"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Fjärr/Markera alla filer"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Fjärr/Avmarkera alla"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Fjärr/Spara kataloglista..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Fjärr/Skicka SITE-kommando..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Fjärr/Byt _katalog"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Fjärr/_Rättigheter..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Fjärr/_Ny mapp..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Fjärr/_Byt namn..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Fjärr/_Ta bort..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Fjärr/R_edigera..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Fjärr/_Visa..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Fjärr/_Uppdatera"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Bokmärken"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Bokmärken/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bokmärken/Lägg till _bokmärke"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bokmärken/Redigera bokmärken"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Bokmärken/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Överföringar"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Överföringar/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Överföringar/S_tarta"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Överföringar/St_oppa"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Överföringar/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Överföringar/_Hoppa över aktuell fil"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Överföringar/_Ta bort fil"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Överföringar/Flytta fil _uppåt"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Överföringar/Flytta fil _nedåt"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Överföringar/_Hämta filer"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Överföringar/_Skicka filer"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_oggning"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Loggning/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Loggning/_Töm"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Loggning/_Visa logg"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Loggning/_Spara logg..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Verktyg"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Verktyg/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Verktyg/_Jämför fönster"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Verktyg/_Töm cache"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Hjälp"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Hjälp/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Värd: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Värd: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Användare: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Användare: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Lösen: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Kommando: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Storlek"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Attribut"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Fel: Du måste skriva in en värd att ansluta till\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Ange användarnamn"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Ange ditt användarnamn för den här platsen"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Ange ditt lösenord för den här platsen"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Åtgärden avbruten... Du måste ange en sträng\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Skapa katalog"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Ange namnet på den nya katalogen"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Byt namn"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Vad vill du att %s ska byta namn till?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Plats"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Ange ett platsspecifikt kommando"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Inled med SITE"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Hoppade över"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Återuppta"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Handling"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Överför filer"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2637,59 +2601,59 @@ msgstr ""
 "Följande fil(er) finns både lokalt och på fjärrvärden\n"
 "Välj vad du vill göra"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Hoppa över"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Markera alla"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Avmarkera alla"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Byt filfilter: Åtgärden avbruten... Du måste ange en sträng\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Ändra filfilter"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Ange det nya filfiltret"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Fel: Kan inte skriva till %s: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Spara kataloglista"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Fel: Fel vid skrivning till %s: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Loggfil sparad till %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Spara logg"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2698,11 +2662,11 @@ msgstr ""
 "Kan inte hitta licensavtalsfilen COPYING. Kontrollera att den finns i "
 "antingen %s eller %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Om gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2713,27 +2677,23 @@ msgstr ""
 "Copyright © 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Officiell hemsida: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Licensavtal"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:364
-msgid "  Close  "
-msgstr "  Stäng  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Jämför fönster"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Koppla ner från fjärrservern"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2741,72 +2701,56 @@ msgstr ""
 "Anslut till platsen angiven i värdposten. Om värdposten är blank, kommer en "
 "dialogruta att visas som låter dig mata in en url."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Buffrat) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Fel när filen %s skulle öppnas: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Inte ansluten till en fjärrvärd\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Den funktionen är inte tillgänglig med det här protokollet\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Du får bara ha ett objekt markerat\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Du måste ha minst ett objekt markerat\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Ändra"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Ja  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Nej  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Hämtar kataloglista"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Stopp  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2815,109 +2759,89 @@ msgstr ""
 "Tog emot %ld kataloger\n"
 "och %ld filer"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-fel: Kan inte hitta filen %s i %s eller %s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Redigera värd"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Lägg till värd"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Domän"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Nätverksadress"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Nätverksadress:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Nätmask"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "_Nätmask:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Domän:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Nätmask"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Lokala värdar"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Redigera"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Tillämpa"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Tar emot filnamn..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Filmottagning: Inte ansluten till en värdplats\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Fel: Underprocessen %d returnerade %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Underprocessen %d avslutades normalt\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Fel: Barnprocess %d avslutades inte korrekt\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Fel: Kan inte få någon information om filen %s: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Filen %s blev inte ändrad\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2926,132 +2850,184 @@ msgstr ""
 "Filen %s har ändrats.\n"
 "Vill du skicka den?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Redigera fil"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Klar"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Skickat %s av %s med %.2fkB/s, %02d.%02d.%02d beräknad tid kvar"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "Tagit emot %s av %s med %.2fkB/s, %02d.%02d.%02d beräknad tid kvar"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Skickat %s av %s, men överföringen har stannat upp, återstående tid okänd"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Tagit emot %s av %s, men överföringen har stannat upp, återstående tid okänd"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Okänt antal procent färdigt. (Fil %ld av %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% färdigt, %02d.%02d.%02d beräknad tid kvar. (Fil %ld av %ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Hämtar filnamn... %s byte"
 
-#: ../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
+#: 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 "Inga filöverföringar är valda\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Visa"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Redigera"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Visa: %s är en katalog. Går inte att visa.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Redigera: %s är en katalog. Går inte att redigera.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Redigera: Du måste ange en redigerare i dialogrutan med alternativ\n"
 
-#: ../src/gtk/view_dialog.c:169
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Visa: Kan inte grena en till process: %s\n"
 
-#: ../src/gtk/view_dialog.c:172
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Kör program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:231
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Öppnar %s med %s\n"
 
-#: ../src/gtk/view_dialog.c:266
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Visar filen %s\n"
 
-#: ../src/gtk/view_dialog.c:273
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Visa: Kan inte öppna filen %s: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kan inte öppna kontrollerande terminal %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Användarnamn [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s finns redan. (%s källstorlek, %s målstorlek):\n"
 "(o)skriv över, åte(r)uppta, (s)hoppa över, (O)skriv över alla, åte(R)uppta "
 "alla, (S)Hoppa över alla: (%c)"
 
+#~ msgid "Preserve file permissions of transfered files"
+#~ msgstr "Bevara filrättigheter på överförda filer"
+
+#~ 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 ""
+#~ ">. Om du har några frågor, kommentarer eller förslag om detta program är "
+#~ "du välkommen att kontakta mig via e-post. Du hittar alltid de senaste "
+#~ "nyheterna om gFTP på min hemsida http://www.gftp.org/ Skicka synpunkter "
+#~ "på översättningen till tp-sv listor tp-sv se\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Avbryt  "
+
+#~ msgid "Host: "
+#~ msgstr "Värd: "
+
+#~ msgid "User: "
+#~ msgstr "Användare: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Stäng  "
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Ja  "
+
+#~ msgid "  No  "
+#~ msgstr "  Nej  "
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Network Address"
+#~ msgstr "Nätverksadress"
+
+#~ msgid "_Edit"
+#~ msgstr "_Redigera"
+
+#~ msgid "Apply"
+#~ msgstr "Tillämpa"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
 #~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
 #~ msgstr ""
-#~ "Fel vid konvertering av strängen \"%s\" till UTF-8 från aktuell lokal: %"
-#~ "s\n"
+#~ "Fel vid konvertering av strängen \"%s\" till UTF-8 från aktuell lokal: "
+#~ "%s\n"
 
 #~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
 #~ msgstr ""
-#~ "Fel vid konvertering av strängen \"%s\" till aktuell lokal från UTF-8: %"
-#~ "s\n"
+#~ "Fel vid konvertering av strängen \"%s\" till aktuell lokal från UTF-8: "
+#~ "%s\n"
 
 #~ msgid "Error: Remote site disconnected after trying to transfer file\n"
 #~ msgstr "Fel: Värden kopplade ner efter försök att överföra fil\n"
@@ -3209,9 +3185,6 @@ msgstr ""
 #~ msgid "Remote SSH sftp path:"
 #~ msgstr "Sökväg till fjärrvärdens SSH-sftp"
 
-#~ msgid "Preserve file permissions of transferred files"
-#~ msgstr "Bevara filrättigheter på överförda filer"
-
 #~ msgid "Invalid argument"
 #~ msgstr "Ogiltigt argument"
 
diff --git a/po/ta.po b/po/ta.po
index 41ee81b..fc0e556 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.master.ta\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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-06-25 17:00+0530\n"
 "Last-Translator: I. Felix <ifelix redhat com>\n"
 "Language-Team: Tamil <fedora-trans-ta redhat com>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,86 +22,86 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "தவறான URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "பிழை: விரைவுச் சுட்டுக்கோப்பில் %s தவறான வரி\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "சரம் '%s'ஐ எழுத்து %sஇலிருந்து  எழுத்துரு அமை %sக்கு மாற்றுவதில் பிழை: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "பிழை: %s உள்ளமைக் கோப்பைத் திறக்க இயலவில்லை: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "பிழை: துளையில் எழுத இயலவில்லை: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "பிழை: துளையிலிருந்து படிக்க இயலவில்லை: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "எச்சரிக்கை: முதன்மை புத்தகக்குறிக் கோப்பினைக் காணோம் %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP எச்சரிக்கை: புத்தகக்குறிக் கோப்பில் %d வரி தவிர்க்கப்படுகிறது: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP எச்சரிக்கை: %d ஆம் வரியில் போதுமான இணைப்புருக்கள் இல்லை\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -110,65 +111,60 @@ msgstr ""
 "இல்லாததுமான உபசரிப்பிகளை இந்தப் பகுதி குறிப்பிடுகிறது. தொடரியல்: dont_use_proxy=."
 "domain or dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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 ""
-"ext=file extenstion:XPM file:Ascii அல்லது Binary (A அல்லது B):viewer program. குறிப்பு: "
-"அனைத்து அளவுருவும் கோப்பு விரிவாக்கம் தவிர விருப்பமுடையது"
+"ext=file extenstion:XPM file:Ascii அல்லது Binary (A அல்லது B):viewer program. "
+"குறிப்பு: அனைத்து அளவுருவும் கோப்பு விரிவாக்கம் தவிர விருப்பமுடையது"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "ஜிFTP பிழை: தவறான அமைவுக் கோப்பின் பெயர் %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "ஜிFTP பிழை: அடைவை உருவாக்க இயலவில்லை %s: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "ஜிFTP பிழை: முதன்மை அமைவுக்கோப்பினைக் காணோம் %s\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "make install செய்தீர்களா?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "ஜிFTP பிழை: தவறான அமைவுக் கோப்பின் பெயர் %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: 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:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "ஜிFTP எச்சரிக்கை: அமைவுக்கோப்பில் %dஆம் வரி தவிர்க்கப்படுகிறது: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "ஜிFTP பிழை: தவறான பதிவுக்கோப்பின் பெயர் %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "ஜிFTP எச்சரிக்கை: %sஐ எழுதுவதற்காகத் திறக்க இயலவில்லை: %s\n"
 
-#: ../lib/config_file.c:732
-#| msgid ""
-#| "Config file for gFTP. Copyright (C) 1998-2003 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"
+#: 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"
@@ -176,24 +172,19 @@ msgstr ""
 "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"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"குறிப்பு: The passwords contained inside this file are scrambled. This algorithm "
-"is not secure. This is to avoid your password being easily remembered by "
-"someone standing over your shoulder while you're editing this file. Prior to "
-"this, all passwords were stored in plaintext."
+"குறிப்பு: The passwords contained inside this file are scrambled. This "
+"algorithm is not secure. This is to avoid your password being easily "
+"remembered by someone standing over your shoulder while you're editing this "
+"file. Prior to this, all passwords were stored in plaintext."
 
-#: ../lib/config_file.c:845
-#| msgid ""
-#| "Config file for gFTP. Copyright (C) 1998-2003 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"
+#: 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. "
@@ -203,220 +194,203 @@ msgstr ""
 "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"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<தெரியாதது>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 "ஜிFTP கொல்பிழை: உலகலாவிய புல அட்டவணையில் '%s' அமைவு விருப்பத்தைக் காணோம்\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
-#| msgid "Error: Cannot open local file %s: %s\n"
 msgid "Error: Cannot upload file %s\n"
 msgstr "பிழை: கோப்பைத் ஏறக்க இயலவில்லை: %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
-#| msgid "Error: Cannot seek on file %s: %s\n"
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "பிழை: %s கோப்பில் எழுத முடியவில்லை: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
-#| msgid "Error: Error writing to %s: %s\n"
 msgid "Error: Error closing file: %s\n"
 msgstr "பிழை: கோப்பை மூடுவதில் பிழை: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
-#| msgid "Cannot accept connection from server: %s\n"
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP சேவையகம் %sஇலிருந்து கோபுப பட்டியல் அழிக்கப்பட்டது\n"
 
-#: ../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
+#: 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 "அறியப்படாதது"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
-#| msgid "Could not get local directory listing %s: %s\n"
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP அடைவுப் பட்டியலிடப்பட்ட %s ஐ பெற இயலவில்லை: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
-#| msgid "Successfully changed local directory to %s\n"
 msgid "Successfully changed directory to %s\n"
 msgstr "வெற்றிகரமாக %sக்கு அடைவு மாற்றப்பட்டது\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
-#| msgid "Could not change local directory to %s: %s\n"
 msgid "Could not change directory to %s\n"
 msgstr "%sக்கு அடைவை மாற்றஇயலவில்லை \n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s வெற்றிகரமாக நீக்கப்பட்டது\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "பிழை: %s கோப்பினை நீக்க இயலவில்லை: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
-#| msgid ""
-#| "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-#| "connection.\n"
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "SSL ஆதரவு தொகுக்கப்படாததால் FTPS ஆதரவு இல்லை. தொடர்பு முறிக்கப்படுகிறது.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "SSL ஆதரவு தொகுக்கப்படாததால் HTTPS ஆதரவு இல்லை. தொடர்பு முறிக்கப்படுகிறது.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "நடப்பு பணியிட அடைவினைப் பெறஇயலவில்லை: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "வெற்றிகரமாக %sக்கு உள்ளமை அடைவு மாற்றப்பட்டது\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "%sக்கு உள்ளமை அடைவை மாற்றஇயலவில்லை: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "பிழை: உள்ளமைக் கோப்பு %sஐத் துணிக்க இயலவில்லை: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "%s உள்ளமை அடைவுப் பட்டியலைப் பெற இயலவில்லை: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
-#| msgid "Successfully changed mode of %s to %d\n"
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "முறைமை %s என்பது %o ஆக வெற்றிகரமாக மாற்றப்பட்டது\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
-#| msgid "Error: Could not change mode of %s to %d: %s\n"
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "பிழை: மு்முறைமை %s என்பதை %o ஆக மாற்ற இயலவில்லை: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
-#| msgid "Successfully changed mode of %s to %d\n"
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s இன் நேர முத்திரை வெற்றிகரமாக மாற்றப்பட்டது\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
-#| msgid "Error: Could not change mode of %s to %d: %s\n"
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "பிழை: %sஇன் நேர முத்திரையை மாற்ற இயலவில்லை: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "உள்ளமை கோப்புமுறை"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "பயன்பாடு: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ஒன்றுமில்லை"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "கோப்பு"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "அளவு"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "பயனாளர்"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "குழுமம்"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "காலநேரம்"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "பண்புகள்"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "இறங்குவரிசை"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ஏறுவரிசை"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "பொது"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "நிரலியைப் பார்:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -424,27 +398,27 @@ msgstr ""
 "கோப்புக்களைப் பார்வையிடக் கொடாநிலையாகப் பார்வையிடும் நிரலி. இது நிரப்பப்படாமல் "
 "இருந்தால்உள்ளமைப் பார்வைநிரலி பயன்படுத்தப்படும்"
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "நிரலியைத் தொகு:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "கோப்புகளைத் தொகுப்பதற்கான கொடாநிலை நிரலி"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "அதிகப்படியான குறிப்பு சாளர அளவு"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ துறைக்கான குறிப்பு சாளரத்தின் அதிகப்படியான அளவு, பைட்டுகளில்"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "தொலை குறியீட்டு கணங்கள்:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -452,199 +426,203 @@ msgstr ""
 "காற்புள்ளியால் பிரிக்கப்பட்ட குறிக்கணங்களின் பட்டியலான இது தொலைச் செய்திகளை நடப்பு locale "
 "ஆக மாற்ற உதவுகிறது."
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "தொலை LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 இன் மதிப்பு தொலை தளத்திற்கான மதிப்பு. இது அடைவு பட்டியலில் சரியாக தேதிக் பகுக்கப்படவில்லை."
+msgstr ""
+"LC_TIME இன் மதிப்பு தொலை தளத்திற்கான மதிப்பு. இது அடைவு பட்டியலில் சரியாக தேதிக் "
+"பகுக்கப்படவில்லை."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "விரைவு TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "விரைவுப் பதிவுகள் காலாவதி ஆவதற்கு முன் காப்பதற்கான மணித்துளிகள்"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "கோப்புப் பரிமாற்றங்களைப் பின்சேர்"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ஏற்கனவே இருப்பதில் புதிய கோப்புப் பரிமாற்றங்களைப் பின்சேர்"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ஒரு சமயத்தில் ஒரு பரிமாற்றத்தைச் செய்"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ஒரு சமயத்தில் ஒரு பரிமாற்றம் மட்டும் செய்யட்டுமா?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "கொடாநிலையாக மேலெழுது"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr ""
 "கொடாநிலையாக கோப்புகளின் மேலெழுது அல்லது விட்ட கோப்புப் பரிமாற்றத்தை தொடர் என்பதாகவே "
 "இருக்கட்டும்"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "கோப்பு அனுமதிகளை இழக்காதே"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "பரிமாற்றப்பட்ட கோப்புகளின் கோப்பு அனுமதிகளை இழக்காதே"
 
-#: ../lib/options.h:82
-#| msgid "Preserve file permissions"
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "கோப்பு நேரத்தை பாதுகாக்கவும்"
 
-#: ../lib/options.h:85
-#| msgid "Preserve file permissions of transfered files"
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "பரிமாற்றப்பட்ட கோப்புகளின் கோப்பு அனுமதிகளை இழக்காதே"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ஒவ்வொரு கோப்பும் பரிமாற்றப்பட்டவுடன் மீளமை"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ஒவ்வொரு கோப்பும் பரிமாற்றப்பட்டவுடன் பட்டியல்பெட்டியை மீளமை"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "அடைவுகளை முதலில் வரிசைப்படுத்து"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "அடைவுகளை முதலிலும் பிறகு கோப்புகளையும் போடு"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "ஒளித்த கோப்புகளையும் காட்டு"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "பட்டியல்பெட்டிகளில் ஒளித்த கோப்புகளையும் காட்டு"
 
-#: ../lib/options.h:100
-#| msgid "Do one transfer at a time"
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "ஒரு  தலைப்பில் இடமாற்ற நிலையை காட்டு"
 
-#: ../lib/options.h:102
-#| msgid "Show hidden files in the listboxes"
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "தலைப்புப்பட்டையில் கோப்பு இடமாற்ற நிலையை காட்டு"
 
-#: ../lib/options.h:103
-#| msgid "Passive file transfers"
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr " கோப்புப் பரிமாற்றங்ளை துவக்கு்"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "வரிசையில் வந்ததும் தானாக கோப்பு இடமாற்றத்தை துவக்கு"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUIஇல் கைமுறை கட்டளைகளை அனுமதி"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUIஇல் கைமுறை கட்டளைகளை உள்ளிட அனுமதிக்கிறது (உரை துறை போன்ற செயல்பாடுகள்)"
 
-#: ../lib/options.h:111
-#| msgid "Remove a local directory"
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "கடைசி மை அடைவிநினைவுக் கொள்ளவும்க்குகிறது"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "பயன்பாடு மூடப்படும் போது தொலை மற்றும் உள்ளமை அடைவுகளை சேமிக்கவும்"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "துவக்கத்தில் தொலை சேவையகத்தை இணைக்கவும்"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "பயன்பாடு துவக்கப்படும் போது தானாக தொலை சேவையகத்தை இணைக்கவும்"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "வளையம்"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "வளையம் காலம் கடந்தது:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
-msgstr "வளையத்தின் உள்ளீடு/வெளியீடுக்கு காலம் கடந்த காத்திருப்பு. இது முடங்கு காலம் கடத்தல் அல்ல"
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+"வளையத்தின் உள்ளீடு/வெளியீடுக்கு காலம் கடந்த காத்திருப்பு. இது முடங்கு காலம் கடத்தல் அல்ல"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "மறுமுயற்சிகளைப் பிணை"
 
-#: ../lib/options.h:130
-#| msgid ""
-#| "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr "செய்யவேண்டிய தானியக்க மறுமுயற்சிகள். வரையிலாமல் மறுமுயற்சி செய்ய இது 0 ஆக இருக்கட்டும்"
+msgstr ""
+"செய்யவேண்டிய தானியக்க மறுமுயற்சிகள். வரையிலாமல் மறுமுயற்சி செய்ய இது 0 ஆக இருக்கட்டும்"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "உறக்க நேர மறுமுயற்சி:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "மறுமுயற்சிகளைக்கிடையேயான மணித்துளிகள் இடைவெளி"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "அதிகம். கி.பை/நிமி:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "ஒரு கோப்புப் பரிமாற்றம் பெறவேண்டிய அதிகப்படியான கி.பை/நிமி (முடக்குவதற்கு 0)"
 
-#: ../lib/options.h:141
-#| msgid "Transfer Files"
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "தொகுதி அளவு இடிமாற்று"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr "இந்த தொகுதி அளவு கோப்புகளை பரிமாற்றும் போது பயன்படுத்தப்படுகிறது. இது 1024 ஆல் பெருக்கப்பட வேண்டும்"
+msgstr ""
+"இந்த தொகுதி அளவு கோப்புகளை பரிமாற்றும் போது பயன்படுத்தப்படுகிறது. இது 1024 ஆல் "
+"பெருக்கப்பட வேண்டும்"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "கொடாநிலை ஒப்புநெறி:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "பயன்படுத்தவேண்டிய கொடாநிலை ஒப்புநெறியை இது குறிக்கிறது"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 துணை செயல்படுகிறது"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -652,27 +630,27 @@ msgstr ""
 "பட்டியல்பெட்டியில் உள்ள கோப்புகளை இருமுறை சொடுக்கினால் என்ன செய்யவேண்டும் என்பதை இது "
 "சொல்கிறது. 0=கோப்பினைப் பார் 1=கோப்பினைத் தொகு 2=கோப்பினை பரிமாற்று"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "உள்ளமைக் கோப்புகளின் பட்டியல்பெட்டியின் கொடாநிலை அகலம்"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "தொலையமைக் கோப்புகளின் பட்டியல்பெட்டியின் கொடாநிலை அகலம்"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "உள்ளமை/வெளியமைக் கோப்புகளின் பட்டியல்பெட்டியின் கொடாநிலை உயரம்"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "பரிமாற்றப் பட்டியல்பெட்டியின் கொடாநிலை உயரம்"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "குறிப்புச் சாளரத்தின் கொடாநிலை உயரம்"
 
-#: ../lib/options.h:177
+#: 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."
@@ -680,15 +658,15 @@ msgstr ""
 "பரிமாற்றச் சாளரத்தில் கோப்பின் பெயர் கட்டத்திற்கான அகலம். தானியக்க அகலத்தைப் பெற 0 என்று "
 "கொடுக்கவும்."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "அடுக்க வேண்டிய கொடாநிலைக் கட்டம்"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ஏறுவரிசை அல்லது இறங்குவரிசை அடுக்குதல்"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -696,7 +674,7 @@ msgstr ""
 "கோப்புப் பட்டியலில் கோப்புப் பெயர் கட்டத்தின் அகலம். தானியக்க அகலத்தைப் பெற 0 என்று "
 "கொடுக்கவும். இந்தக் கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -704,7 +682,7 @@ msgstr ""
 "பட்டியல்பெட்டியில் அளவுக்கட்டத்தின் அகலம். தானியக்க அகலத்தைப் பெற 0 என்று கொடுக்கவும். இந்தக் "
 "கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -712,7 +690,7 @@ msgstr ""
 "பட்டியல்பெட்டியில் பயனாளர் கட்டத்தின் அகலம்.  தானியக்க அகலத்தைப் பெற 0 என்று கொடுக்கவும். "
 "இந்தக் கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -720,7 +698,7 @@ msgstr ""
 "பட்டியல்பெட்டியில் குழுமக் கட்டத்தின் அகலம். தானியக்க அகலத்தைப் பெற 0 என்று கொடுக்கவும். "
 "இந்தக் கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -728,7 +706,7 @@ msgstr ""
 "பட்டியல்பெட்டியில் தேதிக்கட்டத்தின் அகலம். தானியக்க அகலத்தைப் பெற 0 என்று கொடுக்கவும். இந்தக் "
 "கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -736,189 +714,187 @@ msgstr ""
 "பட்டியல்பெட்டியில் பண்புகள் கட்டத்தின் அகலம். தானியக்க அகலத்தைப் பெற 0 என்று கொடுக்கவும். "
 "இந்தக் கட்டத்தை முடக்க -1 கொடுக்கவும்"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "பகிர்விக்கு அனுப்பப்பட்ட கட்டளைகளின் வர்ணம்"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "பகிர்வியால் பெறப்பட்ட கட்டளைகளின் வர்ணம்"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "பிழைச் செய்திகளின் வர்ணம்"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "இன்னபிற குறிப்புச் செய்திகளின் வர்ணம்"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
-#| msgid "FTP"
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "உள்ளமை"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "புத்தகக்குறி"
 
-#: ../lib/options.h:275
-#| msgid "FTP"
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "கோப்புப் பரிமாற்றம் %.2f கிபை/நி வேகத்தில் முடுக்கப்படும்\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME க்கு '%s'ஐ அமைப்பதில் பிழை. '%s'இல் விழுகிறது\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
-#| msgid "Loading directory listing %s from cache\n"
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "விரைவகத்திலிருந்து %s அடைவுப் பட்டியல் ஏற்றப்படுகிறது (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
-#| msgid "Loading directory listing %s from cache\n"
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "விரைவகத்திலிருந்து %s அடைவுப் பட்டியல் ஏற்றப்படுகிறது(LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "எச்சரிக்கை: கோப்பு ஸ்ரிப்பாகிறது '%s'. ஸ்ட்ரிப் செய்யப்பட்ட பாதை(%s) நடப்பு அடைவுடன் (%s) 
பொருந்தவில்லை\n"
+msgstr ""
+"எச்சரிக்கை: கோப்பு ஸ்ரிப்பாகிறது '%s'. ஸ்ட்ரிப் செய்யப்பட்ட பாதை(%s) நடப்பு அடைவுடன் (%s) "
+"பொருந்தவில்லை\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "பிழை: விரைவு நினைவகத்தில் ஏற்ற இயலவில்லை: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "பிழை: புத்தகக்குறியைக் காணோம் %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "புத்தகக்குறிகள் பிழை: %s என்ற புத்தகக்குறிக்கு உபசரிப்பியின் பெயர் இல்லை\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "'%s' வரைமுறைக்குத் தற்சமயம் ஆதரவில்லை.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "மீண்டும் குறியீடு இணைப்பு %s காணப்பட்டது\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "பிழை: தொலை தளம் %s துண்டிக்கப்பட்டது. அனைத்து மறுமுயற்சிகளும் தோல்வியுற்றது..."
 "கைவிடப்பட்டது\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "பிழை: Cannot set close on exec flag: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "முதன்மை pty %s திறக்க இயலவில்லை: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ஒரு துளை ஜோடியை உருவாக்க இயலவில்லை: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "பிழை: sshஐ இயக்க இயலவில்லை: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "மற்றொரு இயக்கத்தை பிளக்க இயலவில்லை: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ப்ராக்ஸி பகிர்வியின் பெயர்:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "தீச்சுவர் பகிர்வியின் பெயர்"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "ப்ராக்ஸி துறை:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "துறை தீச்சுவரில் இணைக்கத் தயாராகிறது"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "ப்ராக்ஸி பயனாளர் பெயர்:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "தங்கள் தீச்சுவர் பயனாளர் பெயர்"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ப்ராக்ஸி கடவுச் சொல்:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "உங்கள் தீச்சுவர் கடவுச்சொல்"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1ஐ உபயோகி"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -927,66 +903,65 @@ msgstr ""
 "பகிர்வியிலிருந்து தவறான பதில் கிடைக்கிறது, துண்டிக்கப்படுகிறது\n"
 "செல்லாத துண்டு அளவு '%s' தொலை பகிர்வியால் திருப்பித்தரப்பட்டது\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
-#| msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ஒதுக்கத்தில் கோப்புப்பரிமாற்றம் துவக்கப்படுகிறது"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s கோப்பினை மீட்க இயலவில்லை\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "அடைவுப்பட்டியல் மீட்கப்படுகிறது...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "பகிர்வியில் இருந்து தவறான பதில் பெறப்பட்டது, துண்டிக்கப்படுகிறது\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE கட்டளை"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP ப்ராக்ஸி"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "தனிப்பயன்"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "மின்னஞ்சல் முகவரி:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -994,19 +969,19 @@ msgstr ""
 "ஒரு தொலை FTP பகிர்வியில் அறிமுகமில்லாதவராக நுழையும் போது இந்தக் கடவுச்சொல்தான் "
 "பயன்படுத்தப்படும்"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "ப்ராக்ஸி கணக்கு:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "தங்கள் தீச்சுவர் கணக்கு (கட்டாயமல்ல)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "ப்ராக்ஸி பகிர்வி வகை:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1023,27 +998,27 @@ msgstr ""
 "h (உபசரிப்பி), o (துறை), a (கணக்கு) என்று இருக்கலாம். உதாரணத்திற்கு ஒரு ப்ராக்ஸி "
 "பயனாளரைக் குறிப்பிட %pu என்று குறிப்பிடலாம்."
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV முகவரியை புறக்கணி"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"செயல்படுத்தப்பட்டால், 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."
+"செயல்படுத்தப்பட்டால், 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."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "ஏவா கோப்புப் பரிமாற்றங்கள்"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1058,11 +1033,11 @@ msgstr ""
 "இயலுமைப்படுத்தலாம். இது முடக்கப்பட்டால் ஜிFTP கட்சிக்காரர் பக்கம் ஒரு துறையைத் திறந்து, "
 "அதனுடன் தொலை பகிர்வியைத் தொடர்பு கொள்ள வைக்கும்."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "தொலை Symlinks (LIST -L)களைப் பிரித்தறி"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1073,15 +1048,16 @@ msgstr ""
 "இயலுமைப்படுத்துதல் என்பது நன்மை பயக்கும். தொலை FTP பகிர்வி LISTக்கு -L விருப்பத்தை இயக்க "
 "இயலாதபோது மட்டும் இதனை முடக்கலாம்."
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "கோப்புகளை ASCII முறையில் பரிமாற்று"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1090,336 +1066,323 @@ msgstr ""
 "குறிப்பிடுகிறது. யுனிக்ஸிலிருந்து யுனிக்ஸுக்கே மாற்றினால் இதனை முடக்குவது நல்லது. "
 "இரும எண்களை இறக்குகையில் இதனை முடக்கலாம்."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
-#| msgid "Failed to create a socket: %s\n"
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "ஒரு IPv4 சாக்கெட்டை உருவாக்க முடியவில்லை: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "PASV பதிலில் IP முகவரியைக் காணோம் '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
-#| msgid "Cannot find an IP address in PASV response '%s'\n"
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr "IP முகவரியை PASV பதிலில் தவிர்க்கிறது, %d.%d.%d.%d:%dஇல் இணைக்கிறது\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "தரவுத் தொடர்பை உருவாக்க இயலவில்லை: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ஒரு துறையைப் பிணைக்க இயலவில்லை: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
-#| msgid "Failed to create a socket: %s\n"
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "ஒரு IPv6 சாக்கெட்டை உருவாக்க முடியவில்லை: %s\n"
 
-#: ../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:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"பிழை: நாம் Ipv6 வழியே இணைக்கப்பட்டதாகத் தெரியவில்லை. தொடர்பு துண்டிக்கப்படுகிறது.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "செல்லாத EPSV பதில் '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "உள்ளமை துளையின் முகவரியைப் பெற இயலவில்லை: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "பகிர்வியிலிருந்து தொடர்பை ஏற்க இயலவில்லை: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "கூடுதல்"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "துளைக் கொடிகளைப் பெறஇயலவில்லை: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "non-blockingக்கு துளையை அமைக்கஇயலவில்லை: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Prog பெயர்:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH செயலிக்கான பாதை"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH Extra Params"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH நிரலிக்குச் செல்லத் தேவையான உபரி வழியலகுகள்"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH User/Pass வேண்டும்"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH தொடர்புகளுக்கு பயனாளர்பெயர்/சங்கேதச்சொல் தேவை"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "நிரலி இயக்கப்படுகிறது %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA விசைக்கான கடவச்சொல்லை உள்ளிடவும்"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "விசைக்கான கடவுச்சொல்லை உள்ளிடவும் '"
 
-#: ../lib/sshv2.c:380
-#| msgid "Password:"
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: ../lib/sshv2.c:381
-#| msgid "Password:"
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "கடவுச்சொல்"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ஆம்/இல்லை)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "கடவுச்சொல்லை உள்ளிடு:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "சங்கேதச் சொல் தாருங்கள்"
 
-#: ../lib/sshv2.c:519
-#| msgid "Enter Password"
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "பாதுகாப்பு குறியீட்டு கடவுச்சொல்லை உள்ளிரு:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "பிழை: தவறான சங்கேதச் சொல் தரப்பட்டுள்ளது\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: நெறிமுறை துவக்க மதிப்பளிக்கப்படுகிறது\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: நெறிமுறை பதிப்பு %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: திற %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: மூடு\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: அடைவைத் திற %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: அடைவை வாசி\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: கோப்பினை நீக்கு %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: அடைவை உருவாக்கு %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: அடைவை நீக்கு %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: கோப்புப் பண்புகள்\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "சரி"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "அதுபோன்ற கோப்போ அடைவோ இல்லை"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "அனுமதி மறுக்கப்பட்டது"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "தோல்வி"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "கெட்ட தகவல்"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "தொடர்பு இல்லை"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "தொடர்பு அறுந்தது"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "செயலுக்கு ஆதரவில்லை"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "பகிர்வி அறியஇயலாத தகவலைத் திருப்பி அனுப்பியது"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "பிழை: செய்தி அளவு %d மிகவும் பெரிது\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1427,42 +1390,41 @@ msgstr ""
 "தொலைப் பகிர்வியுடன் SSH தொடர்பை துவக்குவதில் பிழை நேர்ந்தது. தொலைப் பகிர்வி தந்த பிழை "
 "செய்தி வருமாறு:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH தொடர்பு துவங்கப்படுகிறது %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH பகிர்வியினுள் வெற்றிகரமாக நுழைந்துவிட்டீர்கள் %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL எந்திரம்"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy கோப்பு:"
 
-#: ../lib/sslcommon.c:36
-#| msgid "SSL entropy File"
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropy கோப்பு"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy விதை நீளம்:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "The maximum number of bytes to seed the SSL engine with"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL பீரை சரிபார்க்கவும்"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1475,11 +1437,11 @@ msgstr ""
 "தலைப்பு = %s\n"
 "பிழை %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "ஆழ்ந்த ஆய்வுச் சான்றிதழைப் பெற இயலவில்லை\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1488,46 +1450,45 @@ msgstr ""
 "பிழை: SSL சான்றிதழில் (%s) உள்ள உபசரிப்பி நாம் தொடர்பு கொண்டதுடன் சேரவில்லை (%s). "
 "தொடர்பு துண்டிக்கப்படுகிறது.\n"
 
-#: ../lib/sslcommon.c:302
-#| msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "திறந்த SSL நூலகத்தை துவக்க இயலவில்லை\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "கொடாநிலை SSL சான்றிதழ்களை ஏற்றுவதில் பிழை\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "சுழிப் பட்டியலை அமைப்பதில் பிழை (செல்லுபடியாகும் சுழிகள் இல்லை)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "பிழை: SSL எந்திரம் துவக்கமதிப்பளிக்கப்பட இல்லை\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL தொடர்பை அமைப்பதில் பிழை (BIO object)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL தொடர்பை அமைப்பதில் பிழை (SSL object)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ஆழ்ந்த ஆய்வுச் சான்றிதழில் பிழை: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "செயல்பாடு ரத்தானது\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "மறுமுறை இணைக்கப்படும் முன் %d விநாடிகள் காத்திருப்போம்\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1538,74 +1499,73 @@ msgstr ""
 "விதிமுறைகளுக்கு உட்பட்டு COPYING கோப்பில் உள்ளபடி தமிழ் உலகிற்கு மறுவிநியோகம் "
 "செய்யலாம் \n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "தமிழ் மொழிமாற்றம் பாண்டியன்"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "பயன்பாடு: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "பயன்பாடு: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "பயன்பாடு: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "பயன்பாடு: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
-#| msgid "usage: delete <file>\n"
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "usage: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "பயன்பாடு: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "பயன்பாடு: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "செல்லாத இணைப்புமாறி\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "அடைவு விரைவுநினைவகத்தைத் துடை\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "பயன்பாடு: திற"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "பயன்பாடு: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "பிழை: மாறி %s என்பது ஒரு செல்லும் உருவமைப்பு மாறி அல்ல.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "பிழை: மாறி %s ஜிFTPயின் உரைத்துறையில் கிடைக்க இல்லை\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1613,324 +1573,323 @@ msgstr ""
 "ஆதரவுள்ள கட்டளைகள்:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
-#| msgid "usage: mget <filespec>\n"
 msgid "usage: %s <filespec>\n"
 msgstr "usage: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "இதைப்பற்றி"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "ஜிFTP தகவலைக் காட்டுகிறது"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "நடப்பு கோப்பு பரிமாற்ற முறையை Asciiக்கு மாற்று (FTPக்கு மட்டும்)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "இருமம்"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "நடப்பு கோப்பு பரிமாற்ற முறையை இருமமாக மாற்று (FTPக்கு மட்டும்)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "தொலைப் பணியிட அடைவினை மாற்றுகிறது"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "தொலைக் கோப்பினை அனுமதிகளை மாற்றுகிறது"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "துடை"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "இருக்கும் விருப்பத்தேர்வுகள்: விரைவுநினைவகம்"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "மூடு"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "தொலைத் தளத்திலிருந்து துண்டிக்கப்படுகிறது"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "நீக்கு"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "தொலைக் கோப்பினை நீக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:955
-#| msgid "Chdir"
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "நடப்பு தொலை அடைவின் அடைவுப்பட்டியலைக் காட்டுகிறது"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "தொலைக் கோப்பு(கள்)-ஐ இறக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "உதவி"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "இந்த உதவித் திரையைக் காட்டுகிறது"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "உள்ளமை பணியிட அடைவினை மாற்றுகிறது"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "உள்ளமைக் கோப்பின் அனுமதிகளை மாற்றுகிறது"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "உள்ளமைக் கோப்பினை நீக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:969
-#| msgid "lchdir"
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "நடப்பு உள்ளமை அடைவிற்கு அடைவுப்பட்டியலைக் காட்டுகிறது"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "உள்ளமை அடைவை உருவாக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "நடப்பு பணியிட அடைவினைக் காட்டுகிறது"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "உள்ளமைக் கோப்பிற்கு மறுபெயரிடுகிறது"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "உள்ளமை அடைவினை நீக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "தொலை அடைவை உருவாக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "உள்ளமைக் கோப்பு(கள்)-ஐ ஏற்றுகிறது"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "திற"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "ஒரு தொலைத் தளத்துடன் தொடர்பை ஏற்படுத்துகிறது"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "நடப்பு தொலை உடைவைக் காட்டு"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "மூடு"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "ஜிFTPயிலிருந்து வெளியேறு"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "மறுபெயரிடு"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "தொலைக் கோப்பினை மறுபெயரிடு"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "தொலை அடைவை நீக்குகிறது"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
-msgstr "உருவமைப்புக் கோப்பு மாறிகளைக் காட்டு. set var=val முறையில் கூட மாறிகளை வைக்கலாம்"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
+msgstr ""
+"உருவமைப்புக் கோப்பு மாறிகளைக் காட்டு. set var=val முறையில் கூட மாறிகளை வைக்கலாம்"
 
-#: ../src/uicommon/gftpui.c:1004
-#| msgid "size"
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "தளம்"
 
-#: ../src/uicommon/gftpui.c:1005
-#| msgid "Enter site-specific command"
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "குறிப்பிட்ட கட்டளைக்கு  ஒரு தளத்தை இயக்கவும்"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "பிழை: கட்டளை உணரப்படவில்லை\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%sஐ %.2f கிபை/விநாடியில் வெற்றிகரமாக பரிமாற்றப்பட்டது\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s கோப்பு %s பகிர்வியில் உள்ளதை தவிர்க்கப்படுகிறது\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s பகிர்வியில் கோப்புப் பரிமாற்றத்தை நிறுத்து\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%sஐ %s-லிருந்து இறக்க இயலவில்லை\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
-msgstr "%d கோப்புகள் மற்றும் அடைவுகள் இடமாற்றாதவை உள்ளன. எந்த உருப்படி சரியாக இடமாற்றப்பட்டுள்ளது என பதிவை 
பார்க்கவும்."
+msgstr ""
+"%d கோப்புகள் மற்றும் அடைவுகள் இடமாற்றாதவை உள்ளன. எந்த உருப்படி சரியாக இடமாற்றப்பட்டுள்ளது "
+"என பதிவை பார்க்கவும்."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: எதையும் செய்யும் முன்னர் நிறுத்து பொத்தானை அழுத்துங்கள்\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "புத்தகக்குறியை இயக்கு"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "புத்தகக்குறி சேர்: புத்தகக்குறிக்கான பெயரைச் சேர்க்க வேண்டும்\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "புத்தகக்குறி சேர்: ஏற்கனவே பதிவாகியிருப்பதால் %s புத்தகக்குறியை சேர்க்க இயலவில்லை\n"
+msgstr ""
+"புத்தகக்குறி சேர்: ஏற்கனவே பதிவாகியிருப்பதால் %s புத்தகக்குறியை சேர்க்க இயலவில்லை\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "புத்தகக்குறியைச் சேர்"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "புத்தகக்குறியைச் சேர்: உபசரிப்பியின் பெயர் கொடுத்தாக வேண்டும்\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1940,37 +1899,32 @@ msgstr ""
 "இனங்களை துனை மெனுவில் வைக்க / பயன்படுத்தலாம்\n"
 "(உதா: லினக்ஸ் தளங்கள்/தமிழ்)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "கடவுச்சொல்லை நினைவில் வைத்திரு"
 
-#: ../src/gtk/bookmarks.c:420
-#| msgid "Add Bookmark: You must enter a name for the bookmark\n"
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "புத்தகக்குறிக்கான ஒரு பெயரை  நீங்கள் கட்டாயம் குறிப்பிட றிப்பிட வேண்டும்."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "புதிய அடைவு"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "உருவாக்க வேண்டிய புதிய அடைவை உருவாக்கு"
 
-#: ../src/gtk/bookmarks.c:482
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "புதிய உருப்படி"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "உருவாக்க வேண்டிய புதிய இனத்தின் பெயரைக் கொடுங்கள்"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
-#| msgid ""
-#| "Are you sure you want to erase the bookmark\n"
-#| "%s and all it's children?"
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
@@ -1978,111 +1932,99 @@ msgstr ""
 "புத்தகக்குறி %s மற்றும் அதன் சேய்களையும் \n"
 "அனைத்தையும் அழிக்க விரும்புகிறீர்களா?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "புத்தகக்குறையை நீக்கு"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "புத்தகக்குறிகள்"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "பதிவைத் தொகு"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "விளக்கம்:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "பகிர்வியின் பெயர்:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "துறை:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "நெறிமுறை:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "தொலை அடைவு:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "உள்ளமை அடைவு:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "பயனாளர் பெயர்:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "கணக்கு:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "அறிமுகமில்லாதவராக நுழை"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr " ரத்து "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/கோப்பு _F"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
-#| msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/File/New _Folder..."
 
-#: ../src/gtk/bookmarks.c:1207
-#| msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/New _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
-#| msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/File/_Delete"
 
-#: ../src/gtk/bookmarks.c:1209
-#| msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/File/_Properties..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: ../src/gtk/bookmarks.c:1211
-#| msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/File/_Close"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "புத்தகக்குறிகளைத் தொகு"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2090,93 +2032,90 @@ msgstr ""
 "தற்சமயம் நீங்கள் உங்கள் கோப்பு(கள்)-இன் தன்மைகளைச் சரிசெய்யலாம்\n"
 "குறிப்பு: அனைத்து ftp பகிர்விகளும் chmod வசதியை ஆதரிப்பதில்லை"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "சிறப்பு"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "பயனாளர்"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "வாசி"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "எழுது"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "இயக்கு"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "குழுமம்"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "மற்றது"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "%ld கோப்புகள் மற்றும் %ld அடைவுகளை நீக்குவதில் உறுதியாய் உள்ளீர்களா?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
-#| msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgid "Are you sure you want to delete these %ld files"
 msgstr "இந்த %ld கோப்புகளை அழிக்க விரும்புகிறீர்களா?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
-#| msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "இந்த %ld அடைவுகளை அழிக்க விரும்புகிறீர்களா?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "கோப்புகள்/அடைவுகள் நீக்கம்"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "நீக்கு"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "தொடர்புகொள்"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL பெறப்பட்டது%s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "இழுத்துப் போடு"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "வெளியேறு"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2184,528 +2123,455 @@ msgstr ""
 "கோப்பு பரிமாற்றம் நடந்து கொண்டிருக்கிறது.\n"
 "வெளியேறுவதில் உறுதியாகத்தான் உள்ளீர்களா?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
-#| msgid "Options"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "திறந்த இடம்"
 
-#: ../src/gtk/gftp-gtk.c:219
-#| msgid "Enter ftp url to connect to"
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "இணைக்க வேண்டிய url கொடுங்கள்"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
-#| msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Window _1"
 
-#: ../src/gtk/gftp-gtk.c:269
-#| msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Window _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
-#| msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
-#| msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_Binary"
 
-#: ../src/gtk/gftp-gtk.c:277
-#| msgid "/File/Properties..."
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Preferences..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/மூடு _Q"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/உள்ளமை _L"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/உள்ளமைl/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-#| msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Local/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:285
-#| msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Local/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/உள்ளமை/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
-#| msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Local/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:289
-#| msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Local/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:290
-#| msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Local/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/உள்ளமை/அனைத்துக் கோப்புகளையும் தேர்ந்தெடு"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/உள்ளமை/எதையும் தேர்ந்தெடுக்காதே"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/உள்ளமை/அடைவுப்பட்டியலைச் சேமி"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/உள்ளமை/SITE கட்டளையை அனுப்பு..."
 
-#: ../src/gtk/gftp-gtk.c:296
-#| msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Local/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:297
-#| msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Local/_Permissions..."
 
-#: ../src/gtk/gftp-gtk.c:299
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Local/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:300
-#| msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Local/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:302
-#| msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Local/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:304
-#| msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Local/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:305
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Local/_View..."
 
-#: ../src/gtk/gftp-gtk.c:306
-#| msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/உள்ளமை/புதுப்பி (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/தொலை _R"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Remote/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
-#| msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Remote/_Open Location..."
 
-#: ../src/gtk/gftp-gtk.c:312
-#| msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Remote/D_isconnect"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/தொலை/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
-#| msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Remote/Change _Filespec..."
 
-#: ../src/gtk/gftp-gtk.c:317
-#| msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Remote/_Show selected"
 
-#: ../src/gtk/gftp-gtk.c:318
-#| msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Remote/Select _All"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/தொலை/அனைத்துக் கோப்புகளையும் தேர்ந்தெடு"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/தொலை/எதையும் தேர்ந்தெடுக்காதே"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/தொலை/அடைவுப் பட்டியலைச் சேமி..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/தொலை/SITE கட்டளையை அனுப்பு..."
 
-#: ../src/gtk/gftp-gtk.c:324
-#| msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Remote/_Change Directory"
 
-#: ../src/gtk/gftp-gtk.c:325
-#| msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Remote/_Permisssions..."
 
-#: ../src/gtk/gftp-gtk.c:326
-#| msgid "/File/New Folder..."
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Remote/_New Folder..."
 
-#: ../src/gtk/gftp-gtk.c:328
-#| msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Remote/Rena_me..."
 
-#: ../src/gtk/gftp-gtk.c:330
-#| msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Remote/_Delete..."
 
-#: ../src/gtk/gftp-gtk.c:331
-#| msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Remote/_Edit..."
 
-#: ../src/gtk/gftp-gtk.c:332
-#| msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Remote/_View..."
 
-#: ../src/gtk/gftp-gtk.c:333
-#| msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Remote/_Refresh"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/புத்தகக்குறிகள் _B"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/புத்தகக்குறிகள்/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-#| msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Bookmarks/Add _Bookmark"
 
-#: ../src/gtk/gftp-gtk.c:339
-#| msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Bookmarks/Edit Bookmarks"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/புத்தகக்குறிகள்/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
-#| msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Transfer"
 
-#: ../src/gtk/gftp-gtk.c:342
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Transfer/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
-#| msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Transfer/_Start"
 
-#: ../src/gtk/gftp-gtk.c:344
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Transfer/St_op"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
-#| msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Transfer/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
-#| msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Transfer/Skip _Current File"
 
-#: ../src/gtk/gftp-gtk.c:348
-#| msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Transfer/_Remove File"
 
-#: ../src/gtk/gftp-gtk.c:350
-#| msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Transfer/Move File _Up"
 
-#: ../src/gtk/gftp-gtk.c:352
-#| msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Transfer/Move File _Down"
 
-#: ../src/gtk/gftp-gtk.c:355
-#| msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Transfer/_Retrieve Files"
 
-#: ../src/gtk/gftp-gtk.c:356
-#| msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Transfer/_Put Files"
 
-#: ../src/gtk/gftp-gtk.c:357
-#| msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/L_og"
 
-#: ../src/gtk/gftp-gtk.c:358
-#| msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Log/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
-#| msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Log/_Clear"
 
-#: ../src/gtk/gftp-gtk.c:360
-#| msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Log/_View"
 
-#: ../src/gtk/gftp-gtk.c:361
-#| msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Log/_Save..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/கருவிகள் _T"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/கருவிகள்/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
-#| msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Tools/C_ompare Windows"
 
-#: ../src/gtk/gftp-gtk.c:365
-#| msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Tools/_Clear Cache"
 
-#: ../src/gtk/gftp-gtk.c:366
-#| msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Help"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/உதவி/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
-#| msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "உபசரிப்பி:"
-
-#: ../src/gtk/gftp-gtk.c:490
-#| msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "புரவலன் (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "துறை:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "பயனாளர்:"
-
-#: ../src/gtk/gftp-gtk.c:539
-#| msgid "User: "
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "பயனர் (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "சங்கேதம்:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "கட்டளை: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "கோப்பின் பெயர்"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "அளவு"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "தேதி"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "தன்மைகள்"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "வளர்ச்சிநிலை"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "பிழை: தொடர்புகொள்ள உபசரிப்பியைக் கொடுத்தாக வேண்டும்\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "மீளமை"
 
-#: ../src/gtk/gtkui.c:120
-#| msgid "Username:"
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "பயனர்பெயரை உள்ளிடவும்"
 
-#: ../src/gtk/gtkui.c:121
-#| msgid "Please enter your password for this site"
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "இந்தத் தளத்திற்கான உங்கள் கடவுச்சொல்லைத் உள்ளிடவும்"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "இந்தத் தளத்திற்கான உங்கள் கடவுச்சொல்லைத் தாருங்கள்"
 
-#: ../src/gtk/gtkui.c:298
-#| msgid "SITE: Operation canceled...you must enter a string\n"
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "செயல்பாடு ரத்தானது... நீங்கள் ஒரு சரத்தை உள்ளிட வேண்டும்\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "அடைவை உருவாக்கு"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "உருவாக்க வேண்டிய அடைவின் பெயர்"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "மறுபெயரிடு"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%sஐ என்னவாக பெயர் மாற்ற வேண்டும்?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "தளம்"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "site-specific கட்டளை தருக"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITEஉடன் தயாரித்தல்"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "மேல்எழுது"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "தொடர்"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "தவிர்"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "செயல்"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "கோப்புகளைப் பரிமாற்று"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2713,76 +2579,72 @@ msgstr ""
 "பின்வரும் கோப்பு(கள்) உள்ளமை மற்றும் தொலை கணினிகளிலும் உள்ளன\n"
 "எதைச் செய்யவேண்டும் என்பதைத் தேர்ந்தெடுக்கவும்"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "பிழை"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "கோப்பினைத் தவிர்"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "அனைத்தையும் தேர்ந்தெடு"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "எதையும் தேர்ந்தெடுக்காதே"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec மாற்று: காரியம் ரத்தானது... நீங்கள் ஒரு சொல்லைக் கொடுத்தாக வேண்டும்\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec மாற்று"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "பிழை: %sஐ எழுதுவதற்குத் திறக்க இயலவில்லை: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "அடைவுப்பட்டியலைச் சேமி"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "பிழை: %sல் எழுதுவதில் பிழை: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "வெற்றிகரமாக %sல் குறிப்புக் கோப்பு எழுதப்பட்டது\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "குறிப்பு சேமிக்கப்பட்டது"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "உரிமக் கோப்பு COPYINGஐக் காணோம். %sல் அல்லது %sல் இருக்கவேண்டும் என்பதை உறுதிப்படுத்துங்கள்"
+msgstr ""
+"உரிமக் கோப்பு COPYINGஐக் காணோம். %sல் அல்லது %sல் இருக்கவேண்டும் என்பதை உறுதிப்படுத்துங்கள்"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "ஜிFTP பற்றி"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
-#| msgid ""
-#| "%s\n"
-#| "Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
-#| "Official Homepage: http://www.gftp.org/\n";
-#| "Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgid ""
 "%s\n"
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
@@ -2792,99 +2654,80 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "இதைப்பற்றி"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "உரிம ஒப்பந்தம்"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr " மூடு"
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "சாளரங்களை ஒப்பிடு"
 
-#: ../src/gtk/misc-gtk.c:257
-#| msgid "Disconnects from the remote site"
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "தொலைத் சேவையகத்திலிருந்து துண்டிக்கவும்"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
-msgstr "புரவலன் உள்ளிட்டில் தரத்தை குறிப்பிட்டி இணைக்கிறது. தள உள்ளீடு வெறுமையாக இருந்தால், ஒரு உரையாடல் 
தோன்றி அதில் ஒரு இணைய முகவரியை உள்ளிட வேண்டும்."
+msgstr ""
+"புரவலன் உள்ளிட்டில் தரத்தை குறிப்பிட்டி இணைக்கிறது. தள உள்ளீடு வெறுமையாக இருந்தால், ஒரு "
+"உரையாடல் தோன்றி அதில் ஒரு இணைய முகவரியை உள்ளிட வேண்டும்."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "அனைத்துக் கோப்புகளும்"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (விரைவுசேமிக்கப்பட்டது) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "இணைக்கப்பட இல்லை"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s கோப்பினைத் திறப்பதில் பிழை: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: தொலைத் தளத்துடன் இணைக்கப்பட இல்லை\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: இந்த நெறிமுறையைப் பயன்படுத்துவதில் இந்த வசதி இல்லை\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: ஒரு இனத்தை மட்டுமே தேர்ந்தெடுத்திருக்க வேண்டும்\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: ஒரு இனத்தையாவது தேர்ந்தெடுத்திருக்க வேண்டும்\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "மாற்று"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "சேர்"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "ரத்து"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr " ஆம் "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr " இல்லை "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "அடைவுப் பட்டியல்கள் பெறப்படுகின்றன"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " நிறுத்து "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2893,114 +2736,89 @@ msgstr ""
 "%ld அடைவுகள்\n"
 "மற்றும் %ld கோப்புகள் பெறப்பட்டன"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "ஜிFTP பிழை: %s கோப்பினை %s-இலும் %s-இலும் காணோம்\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "உபசரிப்பையைத் தொகு"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "உபசரிப்பையைச் சேர்"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "வகை:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "வகை: (_T)"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "களம்"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "வளைய முகவரி"
-
-#: ../src/gtk/options_dialog.c:1049
-#| msgid "Network Address"
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "பிணைய முகவரி (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "வளைமுகமூடி"
-
-#: ../src/gtk/options_dialog.c:1090
-#| msgid "Netmask"
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "நெட்மாஸ்க் (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
-#| msgid "Domain"
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "செயற்களம் (_D)"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "வளைமுகமூடி"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "உள்ளமை உபசரிப்பிகள்"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "தொகு"
-
-#: ../src/gtk/options_dialog.c:1290
-#| msgid "Edit"
-msgid "_Edit"
-msgstr "திருத்து (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "விருப்பங்கள்"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "பயன்படுத்து"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "கோப்பின் பெயர்கள் பெறப்படுகின்றன..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "இணைக்கப்படுகிறது..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "கோப்புகள் மீட்பு: தொலைத் தளத்துடன் இணைப்பில்லை\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "பிழை: சேய் %d திரும்பியது%d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "சேய் %d வெற்றிகரமாகத் திரும்பியது\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
-#| msgid "Error: Child %d returned %d\n"
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "பிழை: சேய் %dஐ சரிவர முடிக்க முடியவில்லை\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "பிழை: %s கோப்பு பற்றி தகவலைப் பெற இயலவில்லை: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "கோப்பு %s மாற்றப்பட இல்லை\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -3009,118 +2827,156 @@ msgstr ""
 "கோப்பு %s மாற்றப்பட்டது.\n"
 "நீங்கள் அதனை ஏற்ற விரும்புகிறீர்களா?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "கோப்பினைத் தொகு"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "முடிந்தது"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
-#| msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "%s of %s at %.2fகிபை/வினாடியில் பெறப்பட்டது, %02d:%02d:%02d தோரா. காலம் மீதமுள்ளது"
+msgstr ""
+"%s of %s at %.2fகிபை/வினாடியில் பெறப்பட்டது, %02d:%02d:%02d தோரா. காலம் மீதமுள்ளது"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
-#| msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s இல் %s, பரிமாற்றம் தொழுவத்தில் உள்ளது, மீதமுள்ள காலம் கணிக்க இயலாதது"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "Recv %s of %s, பரிமாற்றம் தொழுவத்தில் உள்ளது, மீதமுள்ள காலம் கணிக்க இயலாதது"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "தெரியாத சதவீதம் முடிவடைந்தது. (கோப்பு %ld இல் %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 தோரா. காலம் மீதமுள்ளது. (%ld-வது கோப்பு %ld-க்கு)"
+msgstr ""
+"%d%% முடிந்தது, %02d:%02d:%02d தோரா. காலம் மீதமுள்ளது. (%ld-வது கோப்பு %ld-க்கு)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "கோப்பின் பெயர்கள் மீட்கப்படுகின்றன...%s பைட்டுகள்"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "பார்வை"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "தொகு"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "பார்வை: மற்ற இயக்கத்தைப் பிளக்க இயலாது: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "நிரலி இயங்குகிறது: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ஐ %s வைத்து திறக்கப்படுகிறது\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s கோப்பு பார்வையிடப்படுகிறது\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "பார்வை: %s கோப்பினைத் திறக்க இயலவில்லை: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "கட்டுப்பாட்டு முனையத்தைத் திறக்க இயலவில்லை %s\n"
 
-#: ../src/text/textui.c:80
-#| msgid "Username:"
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "பயனர்பெயர் [anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s ஏற்கனவே உள்ளது. (%s மூல அளவு, %s இலக்கு அளவு):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr " ரத்து "
+
+#~ msgid "Host: "
+#~ msgstr "உபசரிப்பி:"
+
+#~ msgid "User: "
+#~ msgstr "பயனாளர்:"
+
+#~ msgid "  Close  "
+#~ msgstr " மூடு"
+
+#~ msgid "Add"
+#~ msgstr "சேர்"
+
+#~ msgid "Cancel"
+#~ msgstr "ரத்து"
+
+#~ msgid "  Yes  "
+#~ msgstr " ஆம் "
+
+#~ msgid "  No  "
+#~ msgstr " இல்லை "
+
+#~ msgid "Type:"
+#~ msgstr "வகை:"
+
+#~ msgid "Network Address"
+#~ msgstr "வளைய முகவரி"
+
+#~| msgid "Edit"
+#~ msgid "_Edit"
+#~ msgstr "திருத்து (_E)"
 
+#~ msgid "Apply"
+#~ msgstr "பயன்படுத்து"
diff --git a/po/te.po b/po/te.po
index 4655759..405000c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,108 +6,109 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
-"POT-Creation-Date: 2009-01-17 17:30+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2009-03-20 14:46+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap redhat com>\n"
 "Language-Team: Telugu <en li org>\n"
+"Language: te\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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "చెల్లని URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "దోషం: క్యాషె ఇండెక్స్ దస్త్రము‌లో %s చెల్లని వరుస\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "పదబందము '%s'ను అక్షరసమితి %s నుండి అక్షరసమితి %sకు మార్చుటలో దోషము: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "దోషం: %s స్థానిక దస్త్రము‌ను తెరవడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "దోషం: సాకెట్‌కు వ్రాయడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "దోషం: సాకెట్ నుండి చదవడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "హెచ్చరిక: ప్రధాన బుక్‌మార్కు దస్త్రము‌ను కనుగొనడం సాధ్యం కాదు %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP దోషం: బుక్‌మార్కు‌ల దస్త్రము‌లో %d వరుసను దాటవేయడం: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP హెచ్చరిక: %d వరుసకు తగినన్ని కారకాలు లేవు\n"
 
-#: ../lib/config_file.c:504
+#: 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 ""
-"ఈ విభాగం స్థానిక subnetపై ఉన్న హోస్ట్‌లను పేర్కొని, ప్రాక్సీ సేవిక (అందుబాటులో ఉంటే) "
-"వెలుపలకు పోనవసరం లేదు. సిన్టాక్సు: dont_use_proxy=.domain లేదా "
-"dont_use_proxy=network number/netmask"
+"ఈ విభాగం స్థానిక subnetపై ఉన్న హోస్ట్‌లను పేర్కొని, ప్రాక్సీ సేవిక (అందుబాటులో ఉంటే) వెలుపలకు పోనవసరం "
+"లేదు. సిన్టాక్సు: dont_use_proxy=.domain లేదా dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -115,52 +116,52 @@ msgstr ""
 "ext=file extenstion:XPM file:Ascii లేదా Binary (A లేదా B):viewer program. గమనిక: "
 "దస్త్రము యెక్సెటెన్షన్ తప్ప అన్ని కారకాలు ఐచ్చకము మాత్రమే."
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "make install చేసారా?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP దోషం: తప్పు లాగ్ దస్త్రము నామము %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -168,714 +169,719 @@ msgstr ""
 "gFTP కొరకు బుక్‌మార్కు దస్త్రము నామము. కాపీరైట్ (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. హెచ్చరిక: ఈ దస్త్రమునకు మీరు జతచేసిన వ్యాఖ్యానములు ఏవైనా తిరిగివ్రాయబడతాయి"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
 msgstr ""
-"గమనిక: ఈ దస్త్రమునందు వున్న సంకేతపదములు చర్చించినవి. ఈ అల్గార్దెమ్ సురక్షితమైంది కాదు. "
-"ఇది మీరు ఈ ఫైలును సరికూర్చుచున్నప్పుడు మీ ప్రక్కన వున్నవారు సులువుగా మీ సంకేతపదమును "
-"గుర్తుంచుకొనుటను తప్పించుటకు. దీనికి ముందు, అన్ని సంకేతపదములు సాదాపాఠము రీతిలో "
-"నిల్వవుండేవి."
+"గమనిక: ఈ దస్త్రమునందు వున్న సంకేతపదములు చర్చించినవి. ఈ అల్గార్దెమ్ సురక్షితమైంది కాదు. ఇది మీరు ఈ "
+"ఫైలును సరికూర్చుచున్నప్పుడు మీ ప్రక్కన వున్నవారు సులువుగా మీ సంకేతపదమును గుర్తుంచుకొనుటను "
+"తప్పించుటకు. దీనికి ముందు, అన్ని సంకేతపదములు సాదాపాఠము రీతిలో నిల్వవుండేవి."
 
-#: ../lib/config_file.c:845
+#: 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 లోపల మార్చలేరు"
+"org>. హెచ్చరిక: ఈ దస్త్రమునకు మీరు జతచేసిన ఏ వ్యాఖ్యానములైనా తిరిగివ్రాయబడతాయి. ఒకవేళ ఒక ప్రవేశము (*)"
+"ను వ్యాఖ్యానమునందు కలిగివుంటే, మీరు దానిని gFTP లోపల మార్చలేరు"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<unknown>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 "FATAL gFTP దోషం: గ్లోబల్ హాష్ పట్టికలో '%s' ఆకృతీకరణ ఐచ్చికం కనబడలేదు\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "దోషము: దస్త్రమును ఎక్కించ(అప్‌లోడ్) చేయలేదు%s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "దోషము: దస్త్రమునకు వ్రాయలేక పోయింది %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "దోషము: దస్త్రమును మూయుటలో దోషము: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "FSP సేవిక %s నుండి చెడిపోయిన దస్త్రము జాబితాచేస్తోంది\n"
 
-#: ../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
+#: 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 "తెలియని"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP డైరెక్టరీ జాబితాను పొందలేక పోయింది %s: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "డైరెక్టరీను సమర్ధవంతంగా %sకు మార్చినది\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "డైరెక్టరీను %sకు మార్చలేకపోయింది\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s విజయవంతంగా తొలగించబడింది\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "దోషం: %s దస్త్రము‌ను తొలగించడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr ""
-"SSL మద్దతు సంకలనం చేయలేదు కనుక FTPS మద్దతు అలభ్యం. అనుసంధానమును "
-"నిలిపివేస్తోంది.\n"
+msgstr "SSL మద్దతు సంకలనం చేయలేదు కనుక FTPS మద్దతు అలభ్యం. అనుసంధానమును నిలిపివేస్తోంది.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "SSL మద్దతు సంకలనం చేయలేదు కనుక HTTPS మద్దతు అలభ్యం. అనుసంధానమును నిలిపివేస్తోంది.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "ప్రస్తుత పని డైరెక్టరీని పొందడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "విజయవంతంగా %sకు స్థానిక డైరెక్టరీ మార్చబడింది\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "%sకు స్థానిక డైరెక్టరీకి మార్చడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "దోషం: స్థానిక దస్త్రము %sను నిలిపివేయడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "స్థానిక డైరెక్టరీ జాబితా చేయడం %sను పొందడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s యొక్క రీతి %oకు విజయవంతంగా మార్చబడింది\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "దోషము: %s యొక్క రీతి %oకు మార్చలేక పోయింది: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s యొక్క టైమ్ స్టాంపు విజయవంతంగా మార్చబడింది\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "దోషము: %sయొక్క టైమ్ స్టాంపును మార్చలేకపోయింది: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "స్థానిక దస్త్రము‌సిస్టమ్"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ఉపయోగం: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ఏదీకాదు"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "దస్త్రము"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "పరిమాణం"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "వినియోగదారి"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "సమూహం"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "తేదీసమయం"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "లక్షణాలు"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "అవరోహణం"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "ఆరోహణం"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "సాధారణ"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "ప్రోగ్రామ్ దర్శించు:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
-msgstr "దస్త్రములను దర్శించేందుకు అప్రమేయ ప్రోగ్రామ్. ఇది ఖాళీగా ఉన్నట్లయితే, అంతర్గత దస్త్ర దర్శని 
ఉపయోగించబడుతుంది."
+msgstr ""
+"దస్త్రములను దర్శించేందుకు అప్రమేయ ప్రోగ్రామ్. ఇది ఖాళీగా ఉన్నట్లయితే, అంతర్గత దస్త్ర దర్శని "
+"ఉపయోగించబడుతుంది."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "ప్రోగ్రామ్‌ను సరికూర్చు:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "దస్త్రములను సవరించేందుకు ఉపయోగించే అప్రమేయ ప్రోగ్రామ్"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "గరిష్ట లాగ్ విండో పరిమాణం:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ పోర్ట్‌కు లాగ్ విండో యొక్క గరిష్ట పరిమాణం బైట్లలో"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "రిమోట్ అక్షర సమితులు:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
-msgstr "ఇది ప్రస్తుత localeకు రిమోట్ సందేశాలను రిమోట్ సందేశాలను మార్పిడి చేసేందుకు ప్రయత్నించే కామాచే 
విభజించబడిన అక్షరసమితుల జాబితా."
+msgstr ""
+"ఇది ప్రస్తుత localeకు రిమోట్ సందేశాలను రిమోట్ సందేశాలను మార్పిడి చేసేందుకు ప్రయత్నించే కామాచే విభజించబడిన "
+"అక్షరసమితుల జాబితా."
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "రిమోట్ LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 యొక్క విలువ. ఇందుకనే తేదీలు డైరెక్టరీ జాబితాలనందు "
-"సరిగా పార్శ్ చేయబడతాయి."
+"ఇది రిమోట్ సైటుకొరకు LC_TIME యొక్క విలువ. ఇందుకనే తేదీలు డైరెక్టరీ జాబితాలనందు సరిగా పార్శ్ చేయబడతాయి."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "క్యాషె TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "అవి ముగిసే ముందు క్యాషె నమోదులను పట్టి ఉంచవలసిన సెకన్లు."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "దస్త్రము బదిలీలను జతపరచు"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "ఇప్పటికే ఉన్నవాటికి కొత్త దస్త్రపు బదిలీలను జతపరచు"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ఒక సమయంలో ఒక్క బదిలీని మాత్రమే చెయ్యి"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ఒకసారి ఒక బదిలీ మాత్రమే చేయాలా?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "అప్రమేయముగా తిరిగివ్రాయి"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "దస్త్రములను అప్రమేయముగా తిరిగివ్రాయి లేదా దస్త్రము బదిలీలను తిరిగికొనసాగించుటకు అమర్చు"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "దస్త్రము అనుమతులను భద్రపరచు"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "బదిలీ చేసిన దస్త్రముల యొక్క దస్త్రము అనుమతులను భద్రపరచు"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "దస్త్రము సమయం భద్రపరచుము"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "బదిలీకరించిన దస్త్రముల దస్త్ర సమయములను భద్రపరచుము"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "ప్రతి దస్త్రము బదిలీ తర్వాత రిఫ్రెష్ చెయ్యి"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "ప్రతి దస్త్రము బదిలీ అయిన తర్వాత జాబితాపెట్టెను రిఫ్రెష్ చెయ్యి"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "ముందుగా డైరెక్టరీలను క్రమీకరించు"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "దస్త్రముల కంటే ముందు డైరెక్టరీలను ఉంచు"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "దాగిన దస్త్రములను చూపు"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "జాబితాపెట్టెల్లో దాగిన దస్త్రములను చూపు"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "శీర్షికనందు బదిలీకరణ స్థితిని చూపుము"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "శీర్షికపట్టీ నందు దస్త్రము బదిలీకరణ స్థితిని చూపుము"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "దస్త్రము బదిలీకరణలను ప్రారంభించుము"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "అవి క్యూ చేసినప్పుడు స్వయంచాలకంగా దస్త్రము బదిలీకరణలను ప్రారంభిస్తుంది"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "GUI నందు మానవీయ ఆదేశములను అనుమతించుము"
 
-#: ../lib/options.h:109
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GUIనందు మానవీయ ఆదేశములను ప్రవేశపెట్టుటను అనుమతించుము (పాఠము పోర్టు వంటి ప్రమేయాలు)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "చిరవరి డైరెక్టరీను గుర్తుంచుకొనుము"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "అనువర్తనము మూయబడినప్పుడు ఆఖరి స్థానిక మరియు రిమోడ్ డైరెక్టరీను దాయుము"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "ప్రారంభమునందు రిమోట్ సేవికకు అనుసంధానమవ్వు"
 
-#: ../lib/options.h:117
-msgid "Automatically connect to the remote server when the application is started."
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
 msgstr "అనువర్తనము ప్రారంభించబడినప్పుడు స్వయంచాలకంగా రిమోట్ సేవికకు అనుసంధానించబడుతుంది."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "నెట్‌వర్క్"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "నెట్‌వర్క్ కాలముగింపు:"
 
-#: ../lib/options.h:125
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+#: lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "నెట్‌వర్క్ ఇన్‌పుట్/అవుట్‌పుట్ కోసం కాలముగింపు వేచి ఉంది. ఇది వ్యర్థ కాలముగింపు కాదు."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "అనుసంధానంకు పునఃప్రయత్నిస్తోంది:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "ఎన్నిసార్లు స్వయంచాలక-పునఃప్రయత్నం చాయాలి. అనంతంగా ప్రయత్నించుటకు దీనిని 0కు అమర్చు"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "పునఃప్రయత్న నిద్రాణ సమయం:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "పునఃప్రయత్నాల మధ్య వేచి ఉండవలసిన సెకన్ల సంఖ్య"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "గరిష్టం KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "దస్త్రము బదిలీ పొందగల గరిష్ట KB/s. (నిలిపేందుకు 0కు అమర్చండి)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "బదిలీకరణ బ్లాక్ పరిమాణము:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
-msgstr ""
-"దస్త్రములను బదిలీకరించునప్పుడు వుపయోగించబడు బ్లాక్ పరిమాణము. ఇది 1024 "
-"యొక్క గుణిజం కావాలి."
+msgstr "దస్త్రములను బదిలీకరించునప్పుడు వుపయోగించబడు బ్లాక్ పరిమాణము. ఇది 1024 యొక్క గుణిజం కావాలి."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "ఆప్రమేయ ప్రోటోకాల్:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "ఉపయోగించేందుకు అప్రమేయ ప్రోటోకాల్‌ను ఇది పేర్కొంటుంది"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 మద్దతును చేతనముచేయి"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=దస్త్రము బదిలీ"
+msgstr ""
+"దస్త్రము జాబితా పెట్టెల్లో దస్త్రము‌పై డబుల్ క్లిక్ చేసినప్పుడు ఏమి జరుగుతుందో ఇది వివరిస్తుంది. "
+"0=దస్త్రము దర్శన 1=దస్త్రము సరికూర్పు 2=దస్త్రము బదిలీ"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "స్థానిక దస్త్రముల జాబితా పెట్టె యొక్క అప్రమేయ వెడల్పు"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "రిమోట్ ఫైళ్ల జాబితా పెట్టె యొక్క అప్రమేయ వెడల్పు"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "స్థానిక/రిమోట్ ఫైళ్ల జాబితా పెట్టెల యొక్క అప్రమేయ ఎత్తు"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "బదిలీ జాబితా పెట్టె యొక్క అప్రమేయ ఎత్తు"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "లాగింగ్ విండో యొక్క అప్రమేయ ఎత్తు"
 
-#: ../lib/options.h:177
+#: 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
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "ఈ నిలువు వరుసచే అప్రమేయముగా క్రమీకరించు"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "ఆరోహణం లేదా అవరోహణకు క్రమీకరించు"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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కు అమర్చండి."
+msgstr ""
+"దస్త్రము జాబితా పెట్టెల్లో వినియోగదారి నిలువు వరుస యొక్క వెడల్పు. ఈ నిలువు వరుసను స్వయంచాలకముగా "
+"పరిమాణం మార్చేందుకు దీన్ని 0కు అమర్చండి. ఈ నిలువు వరుసను నిలిపేందుకు దీన్ని -1కు అమర్చండి."
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "సేవికకు పంపిన ఆదేశాల వర్ణము"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "సేవిక నుంచి స్వీకరించిన ఆదేశాల వర్ణము"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "దోష సందేశాల వర్ణము"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "మిగిలిన లాగ్ సందేశాల వర్ణము"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "స్థానిక"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "బుక్‌మార్కు"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "దస్త్రము బదిలీ %.2f KB/s కు పరిమితం చేయబడుతుంది\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME ను '%s'కు అమర్చుటలో దోషము. '%s'కు వెళుతుంది\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "డైరెక్టరీ జాబితా %sను కాషె (LC_TIME=%s)నుండి లోడుచేస్తోంది\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "డైరెక్టరీ జాబితా %sను సేవిక (LC_TIME=%s) నుండి లోడుచేస్తోంది\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "హెచ్చరిక: దస్త్రము '%s' యొక్క స్ట్రిప్పింగ్ పాత్. స్ట్రిప్డు పాత్ (%s) ప్రస్తుత డైరెక్టరీతో సరిపోలదు 
(%s)\n"
+msgstr ""
+"హెచ్చరిక: దస్త్రము '%s' యొక్క స్ట్రిప్పింగ్ పాత్. స్ట్రిప్డు పాత్ (%s) ప్రస్తుత డైరెక్టరీతో సరిపోలదు (%s)\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "దోషం: క్యాషెకు వ్రాయడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "దోషం: బుక్‌మార్కు‌ను కనుగొనడం సాధ్యం కాదు %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "బుక్‌మార్కు‌ల దోషం: %s బుక్‌మార్కు నమోదుకు హోస్ట్‌నామము లేదు\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "'%s' ప్రోటోకాల్‌కు ప్రస్తుతం మద్దతు లేదు.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "పునరావృత సింబాలిక్ లింకును %s కనుగొనబడింది\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "దోషం: రిమోట్ సైట్ %s అననుసంధానం అయింది. గరిష్ట పునఃప్రయత్నాలకు చేరుకున్నారు...వదిలివేస్తోంది\n"
+msgstr ""
+"దోషం: రిమోట్ సైట్ %s అననుసంధానం అయింది. గరిష్ట పునఃప్రయత్నాలకు చేరుకున్నారు...వదిలివేస్తోంది\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "ప్రధాన pty %s తెరవడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "సాకెట్ జతను రూపొందించడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "దోషం: sshను అమలు చేయడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "మరొక ప్రాసెస్‌ను ఫోర్క్ చేయడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ప్రాక్సీ హోస్ట్ నామము:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "ఫైర్‌వాల్ హోస్ట్ నామము"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "ప్రాక్సీ పోర్ట్:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "ఫైర్‌వాల్‌పై పోర్ట్‌కు అనుసంధానం"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "ప్రాక్సీ వినియోగదారి నామము:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "మీ ఫైర్‌వాల్ వినియోగదారి నామము"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "ప్రాక్సీ సంకేతపదము:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "మీ ఫైర్‌వాల్ సంకేతపదము"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 ఉపయోగించు"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -884,83 +890,83 @@ msgstr ""
 "సేవిక నుంచి తప్పు స్పందనను స్వీకరించింది, అననుసంధానం అవుతోంది\n"
 "చెల్లని భాగం పరిమాణం '%s' రిమోట్ సేవిక‌చే పంపబడింది\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "ఆఫ్‌సెట్ వద్ద దస్త్రము బదిలీకరణను ప్రారంభిస్తోంది "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s దస్త్రము‌ను తిరిగి పొందడం సాధ్యం కాదు\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "డైరెక్టరీ జాబితాను తిరిగి పొందుతోంది...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "సేవిక నుండి తప్పు స్పందనను స్వీకరించింది, అననుసంధానము అవుతోంది\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE ఆదేశం"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP ప్రాక్సీ"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "మలచుకొను"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "ఇమెయిల్ చిరునామా:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "రిమోట్ FTP సేవిక‌లోనికి అజ్ఞాతంగా మీరు లాగ్ అయినప్పుడు ఈ సంకేతపదము ఉపయోగించబడుతుంది"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "ప్రాక్సీ ఖాతా:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "మీ ఫైర్‌వాల్ ఖాతా (ఐచ్ఛికం)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "ప్రాక్సీ సేవిక రకం:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -969,29 +975,32 @@ 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 అక్షరాల భర్తీ స్ట్రింగ్‌ను పేర్కొనవచ్చు. FTP సేవిక యొక్క హోస్ట్‌కు మొదటి అక్షరం 
ప్రాక్సీకి p లేదా హోస్ట్‌కు h అని ఉండవచ్చు. u (వినియోగదారి), p (పాస్), h (హోస్ట్) లేదా o (పోర్ట్)లలో ఏదైనా 
రెండవ అక్షరమై ఉండవచ్చు. ఉదాహరణకు, ప్రాక్సీ సేవిక‌ను పేర్కొనేందుకు, మీరు %pu ��
 �ని టైప్ చేయవచ్చు."
+msgstr ""
+"మేము ఎలా లాగ్ ఇన్ చేయాలని మీ ప్రాక్సీ సేవిక భావిస్తోందో ఇది పేర్కొంటుంది. తగిన డేటాతో భర్తీ అయ్యేలా మీరు 
%తో "
+"మొదలయ్యే 2 అక్షరాల భర్తీ స్ట్రింగ్‌ను పేర్కొనవచ్చు. FTP సేవిక యొక్క హోస్ట్‌కు మొదటి అక్షరం ప్రాక్సీకి p 
లేదా "
+"హోస్ట్‌కు h అని ఉండవచ్చు. u (వినియోగదారి), p (పాస్), h (హోస్ట్) లేదా o (పోర్ట్)లలో ఏదైనా రెండవ అక్షరమై "
+"ఉండవచ్చు. ఉదాహరణకు, ప్రాక్సీ సేవిక‌ను పేర్కొనేందుకు, మీరు %pu అని టైప్ చేయవచ్చు."
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV చిరునామాను వదిలివేయుము"
 
-#: ../lib/rfc959.c:72
+#: 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 ""
-"ఇది చేతనము చేయబడితే, FTP సేవికలయొక్క PASV IP చిరునామా క్షేత్రము వదిలివేయబడుతుంది "
-"మరియు బదులుగా హోస్ట్ IP చిరునామా వుపయోగించబడుతుంది. PASV సమాధానమునందు "
-"వాటి బహిర్గత IP చిరునామాలకంటే అంతర్గత చిరునామాలను యిచ్చే రూటర్లకు యిది తరచుగా "
-"అవసరమౌతుంది."
+"ఇది చేతనము చేయబడితే, FTP సేవికలయొక్క PASV IP చిరునామా క్షేత్రము వదిలివేయబడుతుంది మరియు బదులుగా "
+"హోస్ట్ IP చిరునామా వుపయోగించబడుతుంది. PASV సమాధానమునందు వాటి బహిర్గత IP చిరునామాలకంటే అంతర్గత "
+"చిరునామాలను యిచ్చే రూటర్లకు యిది తరచుగా అవసరమౌతుంది."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "సాత్విక దస్త్రము బదిలీలు"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1000,408 +1009,402 @@ 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
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "రిమోట్ Symlinks (LIST -L)ను పరిష్కరించు"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
 msgstr ""
-"డైరెక్టరీ జాబితాల్లోని symlinksను పరిష్కరించేందుకు రిమోట్ FTP సేవిక ప్రయత్నిస్తుంది. "
-"సాధారణంగా, ప్రారంభించి ఉండటం ఉత్తమం. LISTకు -L ఎంపికను రిమోట్ FTP సేవిక "
-"మద్దతు ఇవ్వనప్పుడు మాత్రమే దీన్ని నిలిపివేయవలసి ఉంటుంది."
+"డైరెక్టరీ జాబితాల్లోని symlinksను పరిష్కరించేందుకు రిమోట్ FTP సేవిక ప్రయత్నిస్తుంది. సాధారణంగా, ప్రారంభించి 
"
+"ఉండటం ఉత్తమం. LISTకు -L ఎంపికను రిమోట్ FTP సేవిక మద్దతు ఇవ్వనప్పుడు మాత్రమే దీన్ని నిలిపివేయవలసి "
+"ఉంటుంది."
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ASCII రీతిలో దస్త్రములను బదిలీ చెయ్యి"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
-"మీరు విండోస్ నుంచి యూనిక్స్ పెట్టె లేదా విపర్యయంగా పాఠపు దస్త్రము‌ను బదిలీ చేస్తున్నట్లయితే, "
-"మీరు దీన్ని ప్రారంభించాలి. పాఠము దస్త్రములకు ఒక్కో సిస్టమ్ కొత్త వరుసలను ప్రాతినిథ్యం చేస్తుంది. "
-"మీరు యూనిక్స్ నుంచి యూనిక్స్‌కు బదిలీ చేస్తున్నట్లయితే, దీన్ని నిలిపివేయడం సురక్షితం. "
-"మీరు బైనరీ డేటాను దిగుమతి చేస్తుంటే, మీరు దీన్ని నిలిపివేయాలి."
+"మీరు విండోస్ నుంచి యూనిక్స్ పెట్టె లేదా విపర్యయంగా పాఠపు దస్త్రము‌ను బదిలీ చేస్తున్నట్లయితే, మీరు దీన్ని "
+"ప్రారంభించాలి. పాఠము దస్త్రములకు ఒక్కో సిస్టమ్ కొత్త వరుసలను ప్రాతినిథ్యం చేస్తుంది. మీరు యూనిక్స్ నుంచి "
+"యూనిక్స్‌కు బదిలీ చేస్తున్నట్లయితే, దీన్ని నిలిపివేయడం సురక్షితం. మీరు బైనరీ డేటాను దిగుమతి చేస్తుంటే, మీరు 
"
+"దీన్ని నిలిపివేయాలి."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "PASV స్పందనలో IP చిరునామాను కనుగొనడం సాధ్యం కాదు '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "డేటా అనుసంధానమును రూపొందించడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "పోర్ట్‌ను కలపడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6 సాకెట్ సృష్టించుటకు విఫలమైంది: %s\n"
 
-#: ../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:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+msgstr ""
+"దోషం: మేము Ipv6 ద్వారా అనుసంధానము అయినట్లు అనిపించడం లేదు. అనుసంధానమును నిలిపివేస్తోంది.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "చెల్లని EPSV స్పందన '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "స్థానిక సాకెట్ యొక్క చిరునామాను పొందడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "సేవిక నుంచి అనుసంధానమును అంగీకరించడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "మొత్తం"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "సాకెట్ పతాకాలను పొందడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "non-blockingకు సాకెట్‌ను అమర్చడం సాధ్యం కాదు: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Prog నామము:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH అమలుకు పథం"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH Extra Params"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH ప్రోగ్రామ్‌కు వెళ్లవలసిన అదనపు పారామీటర్లు"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH User/Pass అవసరం"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH అనుసంధానములకు వినియోగదారి నామము/సంకేతపదము అవసరం"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "అమలవుతున్న ప్రోగ్రాం %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA కీ కొరకు సంకేతపదమును ప్రవేశపెట్టుము"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "కీ ' కొరకు సంకేతపదమును ప్రవేశపెట్టుము"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "సంకేతపదము"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "సంకేతపదము"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(అవును/కాదు)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "సంకేతపదమును ప్రవేశపెట్టుము:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "సంకేతపదమును ప్రవేశపెట్టుము"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID సంకేతపదమును ప్రవేశపెట్టుము:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "దోషం: సరికాని సంకేతపదము ప్రవేశపెట్టబడింది\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: ప్రోటోకాల్ ఉపక్రమణం\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: ప్రోటోకాల్ వెర్షన్ %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: తెరువు %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: మూయుము\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: డైరెక్టరీని తెరువు %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: డైరెక్టరీని చదువు\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: దస్త్రము‌ను తొలగించు %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: డైరెక్టరీని చెయ్యి %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: డైరెక్టరీని తొలగించు %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: దస్త్రము లక్షణాలు\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "సరే"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "అలాంటి దస్త్రము లేదా డైరెక్టరీ లేదు"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "అనుమతి తిరస్కరించబడినది"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "వైఫల్యం"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "తప్పు సందేశం"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "అనుసంధానము లేదు"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "అనుసంధానము పోయింది"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "చర్యకు మద్దతు లేదు"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "సేవిక నుంచి తెలియని సందేశం పంపబడింది"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "దోషం: సందేశ పరిమాణం %d చాలా పెద్దది\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
+msgstr ""
+"రిమోట్ సేవిక‌తో SSH అనుసంధానమును ఉపక్రమించడంలో దోషం. రిమోట్ సేవిక నుండి దోష సందేశం దిగువన ఉంది:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "SSH అనుసంధానము దీనికి తెరుస్తోంది %s\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "SSH సేవిక‌కు విజయవంతంగా లాగ్ అయింది %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL ఇంజిన్"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy దస్త్రము:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL ఎన్ట్రోపి దస్త్రము"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy సీడ్ పొడవు:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL యింజన్‌ను సీడ్ చేయుటకు గరిష్ట బైట్ల సంఖ్య"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL పీర్‌ను నిర్ధారించుము"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1414,132 +1417,133 @@ msgstr ""
 "విషయం = %s\n"
 "దోషం %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "సమాన దృవీకరణపత్రము‌ను పొందడం సాధ్యం కాదు\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
-msgstr "దోషం: SSL దృవీకరణపత్రము (%s) లోని హోస్ట్‌కు మనం అనుసంధానము చేసిన (%s) హోస్ట్‌కు పోలిక కుదరలేదు. 
అనుసంధానమును నిలిపివేస్తోంది.\n"
+msgstr ""
+"దోషం: SSL దృవీకరణపత్రము (%s) లోని హోస్ట్‌కు మనం అనుసంధానము చేసిన (%s) హోస్ట్‌కు పోలిక కుదరలేదు. "
+"అనుసంధానమును నిలిపివేస్తోంది.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL లైబ్రరీను సిద్దీకరించలేక పోయింది\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "అప్రమేయ SSL దృవీకరణపత్రములను లోడ్ చేయడంలో దోషం\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "సంకేత లిపి జాబితాను అమర్చడంలో దోషం (సరైన సంకేత లిపులు లేవు)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "దోషం: SSL ఇంజిన్ ఉపక్రమించబడలేదు\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL అనుసంధానమును అమర్చడంలో దోషం (BIO object)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL అనుసంధానమును అమర్చడంలో దోషం (SSL object)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "సమాన దృవీకరణపత్రము‌తో దోషం: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "ఆపరేషన్ రద్దు అయింది\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "మళ్లీ అనుసంధానము చేసేందుకు ప్రయత్నించే లోపు %d సెకన్లు వేచి ఉంటుంది\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "అనువాదము వీరిచే చేయబడింది"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ఉపయోగం: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ఉపయోగం: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ఉపయోగం: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ఉపయోగం: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ఉపయోగం: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ఉపయోగం: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ఉపయోగం: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "చెల్లని కారకం\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "డైరెక్టరీ క్యాషెను తుడువు\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ఉపయోగం: open"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ఉపయోగం: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "దోషం: చరాంశం %s సరైన ఆకృతీకరణ చరాంశం కాదు.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: 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:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1547,321 +1551,321 @@ msgstr ""
 "మద్దతు గల ఆదేశాలు:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ఉపయోగం: %s <filespec>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "గురించి"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP సమాచారాన్ని చూపుతుంది"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "ప్రస్తుత దస్త్రము బదిలీ రీతిను Asciiకు అమర్చుతుంది (FTPకు మాత్రమే)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "బైనరీ"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "ప్రస్తుత దస్త్రము బదిలీ మోడ్‌ను బైనరీకి అమర్చుతుంది (FTPకు మాత్రమే)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "రిమోట్ పని చేసే డైరెక్టరీని మార్చుతుంది"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "రిమోట్ దస్త్రము యొక్క అనుమతులను మార్చుతుంది"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "తుడువు"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "అందుబాటులోని ఎంపికలు: క్యాషె"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "ముయ్యి"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "రిమోట్ సైట్ నుండి అననుసంధానము చేస్తుంది"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "తొలగించు"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "రిమోట్ దస్త్రము‌ను తొలగిస్తుంది"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "ప్రస్తుత రిమోట్ డైరెక్టరీకి డైరెక్టరీ జాబితాను చూపుతుంది"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "పొందు"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "రిమోట్ దస్త్రము(ల)ను దిగుమతి చేస్తుంది"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "సహాయం"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "ఈ సహాయ తెరను చూపు"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "స్థానిక పని చేసే డైరెక్టరీని మార్చుతుంది"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "స్థానిక దస్త్రము యొక్క అనుమతులను మార్చుతుంది"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "స్థానిక దస్త్రము‌ను తొలగిస్తుంది"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "ప్రస్తుత స్థానిక డైరెక్టరీకి డైరెక్టరీ జాబితాను చూపుతుంది"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "స్థానిక డైరెక్టరీని రూపొందిస్తుంది"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "ప్రస్తుత స్థానిక డైరెక్టరీని చూపు"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "స్థానిక దస్త్రము నామము మార్చు"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "స్థానిక డైరెక్టరీని తొలగించు"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "రిమోట్ డైరెక్టరీని రూపొందిస్తుంది"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "స్థానిక దస్త్రము(ల)ను అప్‌లోడ్ చేస్తుంది"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "తెరువు"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "రిమోట్ సైట్‌కు అనుసంధానమును తెరుస్తుంది"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "ప్రస్తుత రిమోట్ డైరెక్టరీని చూపు"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "నిష్క్రమణ"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP నుంచి నిష్క్రమించు"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "నామముమార్చు"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "రిమోట్ దస్త్రము నామముమార్చు"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "రిమోట్ డైరెక్టరీని తొలగించు"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr "కన్ఫిగరేషన్ దస్త్రము చరాంశాలను చూపు. set var=val ద్వారా కూడా మీరు చరాంశాలను పొందవచ్చు"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "సైటు"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "సైటుకు ప్రత్యేకమైన ఆదేశమును నడుపుము"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "దోషం: ఆదేశం గుర్తించబడలేదు\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s దస్త్రము‌ను %s హోస్ట్‌పై దాటవేస్తోంది\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "హోస్ట్‌ %sపై బదిలీని నిలుపుతోంది\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%sను %s నుంచి దిగుమతి చేయడం సాధ్యం కాదు\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr ""
-"బదిలీకరించలేక పోయిన డైరెక్టరీలనందు %d దస్త్రములు వున్నాయి. ఏ అంశములు సరిగా "
-"బదిలీకరించబడలేదో వాటికొరకు లాగ్‌ను నొక్కుము."
+"బదిలీకరించలేక పోయిన డైరెక్టరీలనందు %d దస్త్రములు వున్నాయి. ఏ అంశములు సరిగా బదిలీకరించబడలేదో వాటికొరకు "
+"లాగ్‌ను నొక్కుము."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: మరేదైనా చేసేందుకు ముందుగా దయచేసి నిలుపు బటన్‌ను నొక్కండి\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "బుక్‌మార్కు‌ను అమలు చెయ్యి"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "బుక్‌మార్కు‌ను చేర్చు: మీరు బుక్‌మార్కు‌కు నామమును నమోదు చేయాలి\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "బుక్‌మార్కు‌ను చేర్చు: ఆ నామము ఇప్పటికే ఉన్నందున %s బుక్‌మార్కు‌ను చేర్చడం సాధ్యం కాదు\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "బుక్‌మార్కు‌ను చేర్చు"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "బుక్‌మార్కు‌ను చేర్చు: మీరు హోస్ట్ నామమును నమోదు చేయాలి\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1871,31 +1875,31 @@ msgstr ""
 "దాన్ని ఉపమెనులో ఉంచేందుకు అంశాలను / తో మీరు విభజించవచ్చు\n"
 "(ఉదా: లినక్స్ సైట్లు/తెలుగు)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "సంకేతపదము‌ను గుర్తుంచుకో"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "బుక్‌మార్కు కొరకు మీర తప్పక వొక నామమును తెలుపవలెను"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "కొత్త ఫోల్డర్"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "కొత్త ఫోల్డర్‌ను రూపొందించేందుకు నామమును నమోదు చేయండి"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "కొత్త అంశము"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "కొత్త అంశాన్ని రూపొందించేందుకు నామమును నమోదు చేయండి"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1904,106 +1908,99 @@ msgstr ""
 "మీరు ఖచ్చితంగా బుక్‌మార్కు‌ను చెరిపివేద్దమని అనుకొనుచున్నరా\n"
 "%s మరియు దానిని చిల్డ్రన్‌ను?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "బుక్‌మార్కు‌ను తొలగించు"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "బుక్‌మార్కులు"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "నమోదును సరికూర్చు"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "విశదీకరణ:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "హోస్ట్ నామం:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "పోర్ట్:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "ప్రోటోకాల్:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "రిమోట్ డైరెక్టరీ:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "స్థానిక డైరెక్టరీ:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "వినియోగదారి నామము:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "సంకేతపదము:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "ఖాతా:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "అజ్ఞాతంగా లాగ్ ఇన్ అవండి"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  రద్దు  "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/దస్త్రము (_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/దస్త్రము/టియరాఫ్"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/దస్త్రము/కొత్త ఫోల్డర్... (_F)"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/File/New _Item..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/దస్త్రము/తొలగించుము (_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/దస్త్రము/లక్షణములు... (_P)"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/దస్త్రము/సెప్"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/దస్త్రము/మూయి (_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "బుక్‌మార్కు‌లను సరికూర్చు"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2011,91 +2008,90 @@ msgstr ""
 "మీరు ఇప్పుడు మీ దస్త్రముల యొక్క లక్షణాలను మాత్రమే సర్దుబాటు చేయగలరు\n"
 "గమనిక: అన్ని ftp సేవికలు chmod ఫీచర్‌కు మద్దతు ఇవ్వవు"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "ప్రత్యేకం"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "వినియోగదారి"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "చదువుము"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "వ్రాయి"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "అమలు"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "సమూహం"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "ఇతరములు"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "%ld దస్త్రములు మరియు %ld డైరెక్టరీలను తొలగించదలిచారా"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "మీరు ఈ %ld దస్త్రములను తొలగించాలని అనుకొనుచున్నారా"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "మీరు ఈ %ld డైరెక్టరీలను ఖచ్చితంగా తొలగించాలని అనుకొనుచున్నారా"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "దస్త్రములను/డైరెక్టరీలను తొలగించుము"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "తొలగించుము"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "అనుసంధానించుము"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "URL %s స్వీకరించబడింది\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "లాగి-విడుచు"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "నిష్క్రమణ"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2103,468 +2099,455 @@ msgstr ""
 "దస్త్రము బదిలీలు జరుగుతున్నాయి.\n"
 "మీరు నిష్క్రమించదలిచారా?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "ఈ ప్రదేశం  తెరువు"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "అనుసంధానించుటకు URL ప్రవేశపెట్టుము"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/విండో _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/విండో _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/బైనరీ (_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/అభీష్టాలు... (_P)"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/నిష్క్రమణ (_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/స్థానికం (_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/స్థానికం/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/స్థానికం/స్థానమును తెరువుము... (_O)"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/స్థానికం/అననుసంధానించుము (_i)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/స్థానికం/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/స్థానికం/దస్త్రమువిశదీకరణ మార్చుము... (_F)"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/స్థానికం/ఎంపికైనది చూపుము (_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/స్థానికం/అన్నిటిని యెంపికచేయుము (_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/స్థానికం/అన్ని ఫైళ్లను ఎంచు"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/స్థానికం/అన్నిటి ఎంపికను తొలగించు"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/స్థానికం/డైరెక్టరీ జాబితాను దాయుము..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/స్థానికం/SITE ఆదేశాన్ని పంపు..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/స్థానికం/డైరెక్టరీను మార్చుము (_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/స్థానికం/అనుమతులు... (_P)"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/స్థానికం/కొత్త ఫోల్డర్... (_N)"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/స్థానికం/పునఃనామకరణ... (_m)"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/స్థానికం/తొలగించుము... (_D)"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/స్థానికం/సరికూర్చు... (_E)"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/స్థానికం/దర్శించుము... (_V)"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/స్థానికం/రీఫ్రెష్ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/రిమోట్ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/రిమోట్/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/రిమోట్/స్థానము తెరువుము... (_O)"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/రిమోట్/అననుసంధానించుము (_i)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/రిమోట్/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/రిమోట్/దస్త్రము విశదీకరణను మార్చు... (_F)"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/రిమోట్/ఎంపికైంది చూపుము (_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/రిమోట్/అన్నిటిని యెంపికచేయి (_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/రిమోట్/అన్ని దస్త్రములను యెంపిచేయి"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/రిమోట్/అన్నిటి ఎంపికను తొలగించు"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/రిమోట్/డైరెక్టరీ జాబితాను దాయుము..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/రిమోట్/SITE ఆదేశాన్ని పంపు..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/రిమోట్/డైరెక్టరీ మార్చు (_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/రిమోట్/అనుమతులు... (_P)"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/రిమోట్/కొత్త ఫోల్డర్... (_N)"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/రిమోట్/పునఃనామకరమ... (_m)"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/రిమోట్/తొలగించుము... (_D)"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/రిమోట్/సరికూర్చు... (_E)"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/రిమోట్/దర్శించుము... (_V)"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/రిమోట్/రీఫ్రెష్ (_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/బుక్‌మార్కు‌లు (_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/బుక్‌మార్కు‌లు/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/బుక్‌మార్కులు/బుక్‌మార్కు జతచేయి (_‌B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/బుక్‌మార్కులు/బుక్‌మార్కులు సరికూర్చుము"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/బుక్‌మార్కు‌లు/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/బదిలీకరణ (_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/బదిలీకరించు/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/బదిలీకరించు/ప్రారంభించుము (_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/బదిలీకరించు/ఆపివేయి (_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/బదిలీకరించు/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/బదిలీకరించు/ప్రస్తుత దస్త్రమును వదిలివేయి (_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/బదిలీకరించు/దస్త్రమును తొలగించుము (_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/బదిలీకరించుము/దస్త్రమును పైనకు కదుపుము (_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/బదిలీకరించుము/దస్త్రమును క్రిందకు కదుపుము (_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/బదిలీకరించు/దస్త్రములను తిరిగిపొందుము (_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/బదిలీకరించు/దస్త్రములను వుంచుము (_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/లాగ్ (_o)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/లాగ్/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/లాగ్/శుభ్రంచేయి (_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/లాగ్/దర్శించుము (_V)"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/లాగ్/దాయుము... (_S)"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/ఉపకరణాలు (_s)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/ఉపకరణాలు/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/సాధనములు/విండోలను సరిపోల్చుము (_o)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/సాధనములు/కాషెను శుభ్రముచేయి (_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/సహాయము"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/సహాయం/టియరాఫ్"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/సహాయం/గురించి (_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "హోస్ట్:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "హోస్ట్ (_H): "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "పోర్ట్:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "వినియోగదారి: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "వినియోగదారి (_U): "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "పాస్: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "ఆదేశము: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "దస్త్రము‌నామము"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "తేదీ"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "లక్షణాలు"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "పురోగతి"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "దోషం: అనుసంధానము అయ్యేందుకు మీరు హోస్ట్ నామమును టైప్ చేయాలి\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "రిఫ్రెష్"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "వినియోగదారి నామమును ప్రవేశపెట్టుము"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "ఈ సైటుకొరకు మీ వినియోగదారి నామమును దయచేసి ప్రవేశపెట్టుము"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "దయచేసి ఈ సైట్‌కు మీ సంకేతపదము‌ను నమోదు చేయండి"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "ఆపరేషన్ రద్దుచేయబడింది...మీరు తప్పక పదబందమును ప్రవేశపెట్టవలెను\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "డైరెక్టరీని చెయ్యి"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "రూపొందించేందుకు డైరెక్టరీని నామము నమోదు చెయ్యి"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "పునఃనామకరణ"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%sకు మీరు ఏమని నామము మార్చదలిచారు?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "సైట్"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "site-specific ఆదేశాన్ని నమోదు చేయండి"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SITE తో ప్రిపెండ్"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "తిరిగివ్రాయి"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "తిరిగికొనసాగించు"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "దాటవేయి"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "చర్య"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ఫైళ్లను బదిలీ చెయ్యి"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2572,70 +2555,72 @@ msgstr ""
 "స్థానిక మరియు రిమోట్ కంప్యూటర్‌ల్లో కింది దస్త్రము(లు) ఉన్నాయి\n"
 "దయచేసి మీరు ఏమి చేయదలిచారో ఎంచుకోండి"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "దోషం"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "దస్త్రము దాటవేయి"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "అన్నింటినీ ఎంపిక చేయు"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "అన్నిటి ఎంపిక తొలగించు"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "Filespec మార్చు: ఆపరేషన్ రద్దు అయింది... మీరు ఒక స్ట్రింగ్‌ను నమోదు చేయాలి\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Filespec మార్చు"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "దోషం: %sను వ్రాసేందుకు తెరవడం సాధ్యం కాదు: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "డైరెక్టరీ జాబితాను భద్రపర్చు"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "దోషం: %sకు వ్రాయడంలో దోషం: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "విజయవంతంగా %sకు లాగ్ దస్త్రము‌ను వ్రాసింది\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "లాగ్‌ను భద్రపర్చు"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
-msgstr "లైసెన్స్ ఒప్పందం దస్త్రము COPYINGను కనుగొనడం సాధ్యం కాదు. దయచేసి ఇది %sలో లేదా %sలో ఉందని 
నిర్ధారించుకోండి"
+msgstr ""
+"లైసెన్స్ ఒప్పందం దస్త్రము COPYINGను కనుగొనడం సాధ్యం కాదు. దయచేసి ఇది %sలో లేదా %sలో ఉందని "
+"నిర్ధారించుకోండి"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP గురించి"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2646,100 +2631,80 @@ msgstr ""
 "కాపీరైట్ (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "అధికారిక నివాసపుట: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "గురించి"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "లైసెన్సు ఒప్పందం"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  ముయ్యి  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "విండోలను సరిపోల్చు"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "రిమోట్ సేవికనుండి అననుసంధానించుము"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
 msgstr ""
-"హోస్టు ప్రవేశమునందు తెలుపబడిన సైటు అనుసంధానమవ్వు. ఒకవేళ హోస్టు ప్రవేశము ఖాళీ అయితే, "
-"అప్పుడు డైలాగ్ కనిపిస్తుంది అది మీరు URL ప్రవేశపెట్టుటకు అనుమతిస్తుంది."
+"హోస్టు ప్రవేశమునందు తెలుపబడిన సైటు అనుసంధానమవ్వు. ఒకవేళ హోస్టు ప్రవేశము ఖాళీ అయితే, అప్పుడు డైలాగ్ "
+"కనిపిస్తుంది అది మీరు URL ప్రవేశపెట్టుటకు అనుమతిస్తుంది."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "అన్ని దస్త్రములు"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "అనుసంధానము కాలేదు"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s దస్త్రము‌ను తెరవడంలో దోషం: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: రిమోట్ సైట్‌కు అనుసంధానము కాలేదు\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ఈ ప్రోటోకాల్ ఉపయోగించి ఈ సౌలభ్యం అందుబాటులో లేదు\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: మీరు కేవలం ఒక్క అంశాన్ని మాత్రమే ఎంపిక చేసుకోవచ్చు\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: మీరు కనీసం ఒక్క అంశాన్ని ఎంపిక చేసుకోవాలి\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "మార్చు"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "జతచేయి"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "రద్దుచేయి"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  అవును  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  కాదు  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "డైరెక్టరీ జాబితాలను పొందుతోంది"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  నిలుపు  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2748,109 +2713,89 @@ msgstr ""
 "%ld డైరెక్టరీలు\n"
 "మరియు %ld దస్త్రములను స్వీకరిస్తోంది"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP దోషం: %s లేదా %sలో %s దస్త్రము‌ను కనుగొనడం సాధ్యం కాదు\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "హోస్ట్‌ను సరికూర్చుము"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "హోస్ట్‌ను జతచేయి"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "రకము:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "రకము (_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "డొమైన్"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "నెట్‌వర్క్ చిరునామా"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "నెట్వర్క్ చిరునామా (_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "నెట్‌మాస్క్"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "నెట్‌మాస్క్ (_e):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "డొమైన్ (_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "నెట్‌మాస్క్"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "స్థానిక హోస్ట్‌లు"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "సరికూర్చు"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "సరికూర్చు (_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ఐచ్చికాలు"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "ఆపాదించు"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "దస్త్రము నామములను స్వీకరిస్తోంది..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "అనుసంధానము అవుతోంది..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "దస్త్రములను తిరిగి పొందు: రిమోట్ సైట్‌కు అనుసంధానము కాలేదు\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "దోషం: చైల్డ్ %d పంపినది %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "చైల్డ్ %d విజయవంతంగా పంపింది\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "దోషము: చైల్డ్ %d సరిగా ముగియలేదు\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "దోషం: %s దస్త్రము గురించి సమాచారాన్ని పొందడం సాధ్యం కాదు: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "దస్త్రము %s మారలేదు\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2859,115 +2804,153 @@ msgstr ""
 "దస్త్రము %s మారింది.\n"
 "దీన్ని అప్‌లోడ్ చేయదలిచారా?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "దస్త్రము‌ను సరికూర్చు"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ముగిసింది"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s / %sను %.2fKB/సెకను వద్ద స్వీకరిస్తోంది, %02d:%02d:%02d అంచనా సమయం మిగిలి ఉంది"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%2$s లో %1$s పంపబడింది, బదిలీకరణ నిలిపివుంచబడింది, తెలియని సమయం మిగిలివుంది"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%2$s లో %1$sను స్వీకరిస్తోంది, బదిలీ ఆగింది, మిగిలి ఉన్న సమయం తెలియదు"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "తెలియని శాతము పూర్తైనది. (దస్త్రము %2$ld లో %1$ld)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 అంచనా సమయం మిగిలి ఉంది. (%ld / %ld దస్త్రము)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "దస్త్రము నామములను తిరిగి పొందుతోంది...%s బైట్లు"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "దర్శనం"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "సరికూర్చు"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "దర్శించు: మరొక ప్రాసెస్‌ను అందుకోవడం సాధ్యం కాదు: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "ప్రోగ్రామ్‌ను నడుపుతోంది: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%sను %s తో తెరుస్తోంది\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s దస్త్రము‌ను దర్శిస్తోంది\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "దర్శన: %s దస్త్రము‌ను తెరవడం సాధ్యం కాదు: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "నియంత్రించే టెర్మినల్‌ను తెరవడం సాధ్యం కాదు %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "వినియోగదారినామము [పేరులేని]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s యిప్పటికేవుంది. (%s మూలము పరిమాణం, %s గమ్యపు స్థానము):\n"
-"(o)తిరిగివ్రాయి, (r)తిరిగికొనసాగించు, (s)వదిలివేయి, (O)అన్నిటిని తిరిగివ్రాయి, (R)అన్నిటిని 
తిరిగికొనసాగించు, (S)అన్నిటిని వదిలివేయి: (%"
-"c)"
+"(o)తిరిగివ్రాయి, (r)తిరిగికొనసాగించు, (s)వదిలివేయి, (O)అన్నిటిని తిరిగివ్రాయి, (R)అన్నిటిని 
తిరిగికొనసాగించు, (S)"
+"అన్నిటిని వదిలివేయి: (%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  రద్దు  "
+
+#~ msgid "Host: "
+#~ msgstr "హోస్ట్:"
+
+#~ msgid "User: "
+#~ msgstr "వినియోగదారి: "
+
+#~ msgid "  Close  "
+#~ msgstr "  ముయ్యి  "
+
+#~ msgid "Add"
+#~ msgstr "జతచేయి"
+
+#~ msgid "Cancel"
+#~ msgstr "రద్దుచేయి"
+
+#~ msgid "  Yes  "
+#~ msgstr "  అవును  "
+
+#~ msgid "  No  "
+#~ msgstr "  కాదు  "
+
+#~ msgid "Type:"
+#~ msgstr "రకము:"
+
+#~ msgid "Network Address"
+#~ msgstr "నెట్‌వర్క్ చిరునామా"
+
+#~ msgid "_Edit"
+#~ msgstr "సరికూర్చు (_E)"
 
+#~ msgid "Apply"
+#~ msgstr "ఆపాదించు"
diff --git a/po/th.po b/po/th.po
index 4b9b2fd..d4ca00f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,17 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-21 19:48+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2004-02-21 17:19-0600\n"
 "Last-Translator: Chanchai Junlouchai <taz opentle org>\n"
 "Language-Team: Thai <L10n opentle org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: lib/bookmark.c:39
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL ไม่ถูกต้อง %s\n"
@@ -28,68 +29,76 @@ msgstr "URL ไม่ถูกต้อง %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "ผิดพลาด: ในไฟล์ดัชนีแคชบรรทัดที่ %s ไม่ถูกต้อง\n"
 
-#: lib/cache.c:137 lib/local.c:534
+#: 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"
 
-#: lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถสร้างไฟล์ชั่วคราว: %s\n"
 
-#: lib/cache.c:183 lib/cache.c:232 lib/config_file.c:148 lib/config_file.c:154
-#: lib/local.c:98 lib/local.c:213 lib/rfc2068.c:265 lib/sshv2.c:1000
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "ผิดพลาด: การปิดตัวเก็บรายละเอียดไฟล์ผิดพลาด: %s\n"
 
-#: lib/cache.c:250 lib/local.c:132 lib/local.c:141 lib/local.c:188
+#: 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:117 lib/config_file.c:124 lib/protocols.c:2750
+#: lib/charset-conv.c:71
+#, 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:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถเปิดไฟล์ที่เครื่อง %s: %s\n"
 
-#: lib/config_file.c:134 lib/protocols.c:2455 lib/sslcommon.c:467
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถเขียนลงในซ็อกเก็ต: %s\n"
 
-#: lib/config_file.c:142 lib/protocols.c:2383 lib/sslcommon.c:421
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถอ่านจากซ็อกเก็ต: %s\n"
 
-#: lib/config_file.c:174 lib/config_file.c:730
+#: 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"
 
-#: lib/config_file.c:183
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "คำเตือน: ไม่พบไฟล์บุ๊กมาร์กต้นแบบ %s\n"
 
-#: lib/config_file.c:194 lib/config_file.c:736
+#: 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"
 
-#: lib/config_file.c:286 lib/config_file.c:308
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "คำเตือน gFTP: กำลังข้ามบรรทัด %d ในไฟล์บุ๊กมาร์ก: %s\n"
 
-#: lib/config_file.c:338
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "คำเตือน gFTP: บรรทัด %d มีอาร์กิวเมนต์ไม่เพียงพอ\n"
 
-#: lib/config_file.c:499
+#: lib/config_file.c:504
 #, fuzzy
 msgid ""
 "This section specifies which hosts are on the local subnet and won't need to "
@@ -100,7 +109,7 @@ msgstr ""
 "(ถ้ามีอยู่) Syntax: dont_use_proxy=.domain or dont_use_proxy=network number/"
 "netmask "
 
-#: lib/config_file.c:502
+#: lib/config_file.c:507
 #, fuzzy
 msgid ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
@@ -109,61 +118,61 @@ msgstr ""
 "ext=นามสกุลของไฟล์:XPM file:Ascii or Binary (A or B):viewer program. หมายเหตุ: "
 "ทุกอาร์กิวเมนต์ยกเว้น นามสกุลของไฟล์ เป็นตัวเลือก"
 
-#: lib/config_file.c:580 lib/config_file.c:819
+#: 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:591
+#: 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:601
+#: 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:603
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "คุณจะทำการติดตั้งใช่หรือไม่?\n"
 
-#: lib/config_file.c:612 lib/config_file.c:825
+#: 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:651
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 
-#: lib/config_file.c:657
+#: 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:664
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP เกิดความผิดพลาด: ชื่อไฟล์การบันทึกการปฏิบัติการไม่ถูกต้อง %s\n"
 
-#: lib/config_file.c:670
+#: 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:725
+#: lib/config_file.c:732
 #, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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-2002 Brian Masney <masneyb gftp org> "
 "คำเตือน: ข้อคิดเห็นใดที่คุณเพิ่มลงในไฟล์นี้จะถูกเขียนทับ"
 
-#: lib/config_file.c:726
+#: 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 "
@@ -171,10 +180,10 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: lib/config_file.c:832
+#: lib/config_file.c:845
 #, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -182,328 +191,430 @@ msgstr ""
 "คำเตือน: ข้อคิดเห็นใดๆ ที่คุณเพิ่มลงในไฟล์นี้จะถูกเขียนทับ หากรายการใดมีรูปเครื่องหมาย (*) "
 "อยู่ในข้อคิดเห็นนั้น คุณไม่สามารถเปลี่ยนแปลงมันได้จากภายใน gFTP"
 
-#: lib/config_file.c:1196 lib/rfc2068.c:568 lib/rfc2068.c:569
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<ไม่รู้จัก>"
 
-#: lib/config_file.c:1272 lib/config_file.c:1335 lib/config_file.c:1377
-#: lib/config_file.c:1410
+#: 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 ""
 
-#: lib/ftps.c:138
-msgid ""
-"FTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
+#: lib/fsp.c:189
+#, fuzzy, c-format
+msgid "Error: Cannot upload file %s\n"
+msgstr "ผิดพลาด: ไม่สามารถเปิดไฟล์ที่เครื่อง %s: %s\n"
 
-#: lib/https.c:89
-msgid ""
-"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
-"connection.\n"
-msgstr ""
+#: lib/fsp.c:199
+#, fuzzy, c-format
+msgid "Error: Cannot write to file %s: %s\n"
+msgstr "ผิดพลาด: ไม่สามารถค้นหาไฟล์ %s: %s\n"
 
-#: lib/local.c:67 lib/local.c:464
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "ผิดพลาด: ไม่สามารถเปลี่ยนไดเรกทอรี่ท้องถิ่นไปยัง %s: %s\n"
+#: lib/fsp.c:237
+#, fuzzy, c-format
+msgid "Error: Error closing file: %s\n"
+msgstr "ผิดพลาด: ผิดพลาดขณะเขียนไปยัง %s: %s\n"
 
-#: lib/local.c:81 lib/local.c:449
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "ไม่สามารถรับไดเรกทอรีที่ใช้งานอยู่ขณะนี้: %s\n"
+#: lib/fsp.c:327
+#, fuzzy, c-format
+msgid "Corrupted file listing from FSP server %s\n"
+msgstr "ไม่สามารถยอมรับการเชื่อมต่อจากเซิร์ฟเวอร์: %s\n"
 
-#: lib/local.c:179
-#, c-format
-msgid "Error: Cannot truncate local file %s: %s\n"
-msgstr "ผิดพลาด: ไม่สามารถตัดไฟล์ที่อยู่บนเครื่องให้สั้นลง %s: %s\n"
+#: 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 "ไม่รู้จัก"
 
-#: lib/local.c:404
+#: lib/fsp.c:377
 #, fuzzy, c-format
-msgid "Could not get local directory listing %s: %s\n"
+msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "ไม่พบรายชื่อไดเรกทอรีบนเครื่องผู้ใช้ %s: %s\n"
 
-#: lib/local.c:441
-#, c-format
-msgid "Successfully changed local directory to %s\n"
+#: lib/fsp.c:436
+#, fuzzy, c-format
+msgid "Successfully changed directory to %s\n"
 msgstr "เปลี่ยนไดเรกทอรีบนเครื่องไปยัง %s ได้สำเร็จ\n"
 
-#: lib/local.c:481 lib/local.c:504 src/gtk/transfer.c:229
-#: src/gtk/view_dialog.c:316
+#: lib/fsp.c:446
+#, fuzzy, c-format
+msgid "Could not change directory to %s\n"
+msgstr "ผิดพลาด: ไม่สามารถเปลี่ยนไดเรกทอรี่ท้องถิ่นไปยัง %s: %s\n"
+
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "ย้ายออกเรียบร้อยแล้ว %s\n"
 
-#: lib/local.c:487
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถย้ายไดเรกทอรีออกได้ %s : %s\n"
 
-#: lib/local.c:510 src/gtk/transfer.c:233 src/gtk/view_dialog.c:320
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถย้ายไฟล์ออกได้ %s : %s\n"
 
-#: lib/local.c:527
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "สร้างไดเรกทอรี %s ได้สำเร็จ\n"
 
-#: lib/local.c:553
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "เปลี่ยนชื่อจาก %s ไปเป็น %s ได้สำเร็จ\n"
 
-#: lib/local.c:560
+#: 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/local.c:583
+#: lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/https.c:91
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
+msgstr ""
+
+#: lib/local.c:66
 #, c-format
-msgid "Successfully changed mode of %s to %d\n"
-msgstr "เปลี่ยนโหมดจาก %s ไปยัง %d ได้สำเร็จ\n"
+msgid "Could not get current working directory: %s\n"
+msgstr "ไม่สามารถรับไดเรกทอรีที่ใช้งานอยู่ขณะนี้: %s\n"
+
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "เปลี่ยนไดเรกทอรีบนเครื่องไปยัง %s ได้สำเร็จ\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "ผิดพลาด: ไม่สามารถเปลี่ยนไดเรกทอรี่ท้องถิ่นไปยัง %s: %s\n"
 
-#: lib/local.c:590
+#: lib/local.c:238
 #, c-format
-msgid "Error: Could not change mode of %s to %d: %s\n"
+msgid "Error: Cannot truncate local file %s: %s\n"
+msgstr "ผิดพลาด: ไม่สามารถตัดไฟล์ที่อยู่บนเครื่องให้สั้นลง %s: %s\n"
+
+#: lib/local.c:424
+#, fuzzy, c-format
+msgid "Could not get local directory listing %s: %s\n"
+msgstr "ไม่พบรายชื่อไดเรกทอรีบนเครื่องผู้ใช้ %s: %s\n"
+
+#: lib/local.c:634
+#, fuzzy, c-format
+msgid "Successfully changed mode of %s to %o\n"
+msgstr "เปลี่ยนโหมดจาก %s ไปยัง %d ได้สำเร็จ\n"
+
+#: lib/local.c:641
+#, fuzzy, c-format
+msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถเปลี่ยนโหมดจาก %s ไปยัง %d: %s\n"
 
-#: lib/local.c:682
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "เปลี่ยนโหมดจาก %s ไปยัง %d ได้สำเร็จ\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "ผิดพลาด: ไม่สามารถเปลี่ยนโหมดจาก %s ไปยัง %d: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "ระบบไฟล์บนเครื่อง"
 
-#: lib/misc.c:415
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr ""
 
-#: lib/misc.c:415 src/uicommon/gftpui.c:616
-#, c-format
-msgid "\n"
-msgstr ""
-
-#: lib/options.h:24 lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "ไม่มี"
 
-#: lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "ไฟล์"
 
-#: lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "ขนาด"
 
-#: lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "ผู้ใช้"
 
-#: lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "กลุ่ม"
 
-#: lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr ""
 
-#: lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "คุณลักษณะ"
 
-#: lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr ""
 
-#: lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr ""
 
-#: lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "ทั่วไป"
 
-#: lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "โปรแกรมดูไฟล์:"
 
-#: lib/options.h:38
+#: 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:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "โปรแกรมแก้ไข:"
 
-#: lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "โปรแกรมปริยายที่ใช้เพื่อแก้ไขไฟล์"
 
-#: lib/options.h:42
-msgid "Startup Directory:"
-msgstr "ไดเรกทอรีเริ่มต้น:"
-
-#: lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "ไดเรกทอรีปริยายของ gFTP จะเริ่มการทำงาน"
-
-#: lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "ขนาดหน้าต่างการบันทึกการปฏิบัติการสูงสุด:"
 
-#: lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "ขนาดสูงสุดของหน้าต่างการบันทึกการปฏิบัติการที่มีหน่วยเป็นไบต์ของพอร์ต GTK+"
 
-#: lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr ""
 
-#: lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 
-#: lib/options.h:53
+#: lib/options.h:56
+msgid "Remote LC_TIME:"
+msgstr ""
+
+#: lib/options.h:58
+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 ""
+
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: lib/options.h:56
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "่"
 
-#: lib/options.h:59
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "การถ่ายโอนไฟล์แบบต่อข้อมูล"
 
-#: lib/options.h:61
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "แนบไฟล์ใหม่ที่จะถ่ายโอนไปยังไฟล์ที่มีอยู่แล้ว"
 
-#: lib/options.h:62
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "ถ่ายโอนทีละไฟล์ต่อหนึ่งครั้ง"
 
-#: lib/options.h:64
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "ทำการถ่ายโอนทีละไฟล์ต่อหนึ่งครั้ง ใช่หรือไม่?"
 
-#: lib/options.h:65
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "เขียนทับโดยค่าปริยาย"
 
-#: lib/options.h:68
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "เขียนทับไฟล์โดยค่าปริยายหรือตั้งให้ทำการถ่ายโอนไฟล์อีกครั้ง"
 
-#: lib/options.h:70
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr ""
 
-#: lib/options.h:73
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "คงสิทธิ์ที่อนุญาตของไฟล์ทางไกลไว้"
 
-#: lib/options.h:75
+#: lib/options.h:82
+msgid "Preserve file time"
+msgstr ""
+
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
+msgstr "คงสิทธิ์ที่อนุญาตของไฟล์ทางไกลไว้"
+
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "เรียกใหม่หลังการถ่ายโอนแต่ละไฟล์"
 
-#: lib/options.h:78
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "เรียกกล่องรายการใหม่หลังจากถ่ายโอนแต่ละไฟล์เรียบร้อย"
 
-#: lib/options.h:80
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "เรียงตามไดเรกทอรีเป็นลำดับแรก"
 
-#: lib/options.h:83
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "วางไดเรกทอรีก่อนแล้วตามด้วยไฟล์"
 
-#: lib/options.h:84
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "แสดงไฟล์ซ่อน"
 
-#: lib/options.h:87
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "แสดงไฟล์ซ่อนที่อยู่ในกล่องรายการ"
 
-#: lib/options.h:88
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "แสดงสถานะการถ่ายโอนบนหัวเรื่อง"
 
-#: lib/options.h:90
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "แสดงสถานะการถ่ายโอนบนแถบหัวเรื่อง"
 
-#: lib/options.h:91
+#: lib/options.h:103
+msgid "Start file transfers"
+msgstr "เริ่มการถ่ายโอนไฟล์"
+
+#: lib/options.h:105
+#, fuzzy
+msgid "Automatically start the file transfers when they get queued"
+msgstr "เริ่มการถ่ายโอนไฟล์อัตโนมัติ เมื่อมีไฟล์อยู่ในคิวแล้ว"
+
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr ""
 
-#: lib/options.h:93
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: lib/options.h:95 src/gtk/options_dialog.c:1051
-#: src/gtk/options_dialog.c:1144
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "ย้ายไดเรกทอรีบนเครื่อง"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+msgid "Connect to remote server on startup"
+msgstr ""
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "เครือข่าย"
 
-#: lib/options.h:97
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "การหมดเวลาการเชื่อมต่อเครือข่าย:"
 
-#: lib/options.h:100
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 
-#: lib/options.h:102
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "ลองเชื่อมต่อใหม่:"
 
-#: lib/options.h:105
-msgid "The number of auto-retries to do. Set this to 0 to retry indefinately"
+#: lib/options.h:130
+#, fuzzy
+msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "จำนวนครั้งในการลองเชื่อมต่อใหม่อัตโนมัติ กำหนดค่านี้ให้เป็น 0 "
 "เมื่อต้องการให้เชื่อมต่อใหม่อย่างไม่มีกำหนด "
 
-#: lib/options.h:107
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "เวลาพักในการลองใหม่:"
 
-#: lib/options.h:110
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "จำนวนวินาทีในการรอระหว่างลองใหม่"
 
-#: lib/options.h:111
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "ค่าสูงสุด (กิโลไบต์/วินาที):"
 
-#: lib/options.h:114
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr ""
 "ค่าสูงสุด (กิโลโบต์/วินาที) ของการถ่ายโอนไฟล์ที่สามารถรับได้ (กำหนดให้เป็น 0 เมื่อไม่ใช้งาน)"
 
-#: lib/options.h:117
+#: lib/options.h:141
+#, fuzzy
+msgid "Transfer Block Size:"
+msgstr "ถ่ายโอนไฟล์"
+
+#: lib/options.h:144
+msgid ""
+"The block size that is used when transferring files. This should be a "
+"multiple of 1024."
+msgstr ""
+
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "โพรโตคอลปริยาย"
 
-#: lib/options.h:119
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "โพรโตคอลปริยายที่กำหนดให้ในการใช้งาน"
 
-#: lib/options.h:121 lib/options.h:124
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr ""
 
-#: lib/options.h:129
+#: lib/options.h:159
 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"
@@ -511,42 +622,42 @@ msgstr ""
 "นี่เป็นการกำหนดว่าอะไรจะเกิดขึ้นเมื่อคุณคลิ้กซ้ำที่ไฟล์ในกล่องรายการไฟล์ 0=ดูไฟล์ 1=แก้ไขไฟล์ "
 "2=ถ่ายโอนไฟล์"
 
-#: lib/options.h:132
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "ความกว้างปริยายของกล่องรายการไฟล์ที่เครื่อง"
 
-#: lib/options.h:135
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "ความกว้างปริยายของกล่องรายการไฟล์ที่เครื่องฝั่งโน้น"
 
-#: lib/options.h:138
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "ความสูงปริยายของกล่องรายการไฟล์ที่เครื่อง/ไฟล์ที่เครื่องฝั่งโน้น"
 
-#: lib/options.h:141
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "ความสูงปริยายของกล่องรายการการถ่ายโอน"
 
-#: lib/options.h:144
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "ความสูงปริยายของหน้าต่างการติดตามการใช้งาน"
 
-#: lib/options.h:147
+#: 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 เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ"
 
-#: lib/options.h:151 lib/options.h:157
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "คอลัมน์ปริยายเรียงลำดับโดย"
 
-#: lib/options.h:154 lib/options.h:160
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "เรียงลำดับจากน้อยไปมาก หรือ จากมากไปน้อย"
 
-#: lib/options.h:164 lib/options.h:182
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -554,7 +665,7 @@ msgstr ""
 "ความกว้างของคอลัมน์ชื่อไฟล์ในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 "
 "เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:167 lib/options.h:185
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -562,7 +673,7 @@ msgstr ""
 "ความกว้างของขนาดคอลัมน์ในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 "
 "เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:170 lib/options.h:188
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -570,7 +681,7 @@ msgstr ""
 "ความกว้างของคอลัมน์ผู้ใช้ในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ "
 "กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:173 lib/options.h:191
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -578,7 +689,7 @@ msgstr ""
 "ความกว้างของคอลัมน์กลุ่มในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ "
 "กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:176 lib/options.h:194
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -586,7 +697,7 @@ msgstr ""
 "ความกว้างของคอลัมน์วันที่ในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ "
 "กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:179 lib/options.h:197
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -594,180 +705,144 @@ msgstr ""
 "ความกว้างของคอลัมน์คุณลักษณะในกล่องรายการไฟล์ กำหนดค่านี้ให้เป็น 0 "
 "เพื่อให้ปรับขนาดคอลัมน์ได้อัตโนมัติ กำหนดให้เป็น -1 เมื่อปิดการใช้งาน"
 
-#: lib/options.h:200
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "สีสำหรับคำสั่งที่ถูกส่งไปยังเซิร์ฟเวอร์"
 
-#: lib/options.h:203
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "สีสำหรับคำสั่งที่ได้รับจากเซิร์ฟเวอร์"
 
-#: lib/options.h:206
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "สีสำหรับข้อความผิดพลาด"
 
-#: lib/options.h:209
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "สีที่เตรียมไว้สำหรับข้อความบันทึกการปฏิบัติการ"
 
-#: lib/options.h:215 lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr ""
 
-#: lib/options.h:218 lib/options.h:220
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr ""
 
-#: lib/options.h:223 lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/options.h:226 lib/options.h:228
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr ""
 
-#: lib/options.h:231
+#: lib/options.h:270
 msgid "Local"
 msgstr "เครื่องที่ใช้"
 
-#: lib/options.h:233
+#: lib/options.h:272
 msgid "SSH2"
 msgstr ""
 
-#: lib/options.h:235 src/gtk/bookmarks.c:858
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 #, fuzzy
 msgid "Bookmark"
 msgstr "บุ๊กมาร์ก"
 
-#: lib/protocols.c:221
+#: lib/options.h:275
+msgid "FSP"
+msgstr ""
+
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "การถ่ายโอนไฟล์จะถูกจำกัดที่ %.2f กิโลไบต์/วินาที\n"
 
-#: lib/protocols.c:329
+#: lib/protocols.c:379
 #, c-format
-msgid "Loading directory listing %s from cache\n"
+msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
+msgstr ""
+
+#: lib/protocols.c:390
+#, fuzzy, c-format
+msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "กำลังโหลดรายชื่อไดเรกทอรี %s จากแคช\n"
 
-#: lib/protocols.c:546
+#: lib/protocols.c:400
+#, fuzzy, c-format
+msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
+msgstr "กำลังโหลดรายชื่อไดเรกทอรี %s จากแคช\n"
+
+#: lib/protocols.c:450
+#, 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:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถเขียนลงแคช: %s\n"
 
-#: lib/protocols.c:578
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "ผิดพลาด: ไม่พบบุ๊กมาร์ก %s \n"
 
-#: lib/protocols.c:585
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "บุ๊กมาร์กผิดพลาด: รายการในบุ๊กมาร์ก %s หายไป ดูให้แน่ใจว่ามีชื่อโฮสต์และชื่อผู้ใช้\n"
 
-#: lib/protocols.c:693
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr ""
 
-#: lib/protocols.c:1036 lib/protocols.c:1051 lib/protocols.c:1974
-#: lib/protocols.c:2083
-#, c-format
-msgid "Looking up %s\n"
-msgstr "กำลังค้นหา %s\n"
-
-#: lib/protocols.c:1042 lib/protocols.c:1057 lib/protocols.c:1979
-#: lib/protocols.c:2088
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "ไม่สามารถค้นหาชื่อโฮสต์ %s: %s\n"
-
-#: lib/protocols.c:1348 lib/protocols.c:1349 lib/protocols.c:1390
-#: lib/protocols.c:1391 lib/protocols.c:1450 lib/protocols.c:1457
-#: lib/protocols.c:1536 lib/protocols.c:1537 lib/protocols.c:1571
-msgid "unknown"
-msgstr "ไม่รู้จัก"
-
-#: lib/protocols.c:1997
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "สร้างซ็อกเก็ตล้มเหลว: %s\n"
-
-#: lib/protocols.c:2003 lib/protocols.c:2102
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "พยายาม %s:%d\n"
-
-#: lib/protocols.c:2008 lib/protocols.c:2109
+#: lib/protocols.c:1153
 #, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "ไม่สามารถเชื่อมต่อไปยัง %s: %s\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: lib/protocols.c:2040 lib/rfc959.c:630
+#: lib/protocols.c:1531
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "สร้าง IPv4 ซ็อกเก็ตล้มเหลว: %s\n"
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgstr "ผิดพลาด: ไซต์ทางไกล %s ถูกยกเลิกการเชื่อมต่อ ลองใหม่จนถึงค่าสูงสุด...กำลังจะยกเลิก\n"
 
-#: lib/protocols.c:2064 lib/sshv2.c:898
+#: lib/protocols.c:1539
 #, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
+"ผิดพลาด: ไซต์ทางไกล %s ถูกยกเลิกการเชื่อมต่อ จะทำการเชื่อมต่ออีกครั้งในเวลา %d วินาที\n"
 
-#: lib/protocols.c:2126 lib/protocols.c:2759 lib/rfc959.c:639 lib/rfc959.c:786
+#: lib/protocols.c:1634 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 ""
 
-#: lib/protocols.c:2133
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "เชื่อมต่อไปยัง %s:%d\n"
-
-#: lib/protocols.c:2363 lib/protocols.c:2434
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "หมดเวลาการเชื่อมต่อไปยัง %s\n"
-
-#: lib/protocols.c:2503
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "ไม่ได้รับค่าสถานะซ็อกเก็ต: %s\n"
-
-#: lib/protocols.c:2517
+#: lib/pty.c:301
 #, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "ไม่สามารถตั้งค่าซ็อกเก็ตให้เป็นแบบไม่มีจำกัด (non-blocking): %s\n"
-
-#: lib/protocols.c:2653
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "ผิดพลาด: ไซต์ทางไกล %s ถูกยกเลิกการเชื่อมต่อ ลองใหม่จนถึงค่าสูงสุด...กำลังจะยกเลิก\n"
-
-#: lib/protocols.c:2661
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr ""
-"ผิดพลาด: ไซต์ทางไกล %s ถูกยกเลิกการเชื่อมต่อ จะทำการเชื่อมต่ออีกครั้งในเวลา %d วินาที\n"
+msgid "Cannot open master pty %s: %s\n"
+msgstr "ไม่สามารถเปิด pty ต้นฉบับ %s: %s\n"
 
-#: lib/pty.c:288
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "ไม่สามารถสร้างคู่ซ็อกเก็ต: %s\n"
 
-#: lib/pty.c:307 lib/pty.c:364
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถประมวลผล ssh: %s\n"
 
-#: lib/pty.c:320 lib/pty.c:375
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "ไม่สามารถแตกโพรเซสได้: %s\n"
 
-#: lib/pty.c:338
-#, c-format
-msgid "Cannot open master pty %s: %s\n"
-msgstr "ไม่สามารถเปิด pty ต้นฉบับ %s: %s\n"
-
 #: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "ชื่อโฮสต์พร็อกซี:"
@@ -808,42 +883,33 @@ 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:154 lib/rfc2068.c:866
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr ""
 
-#: lib/rfc2068.c:260 lib/rfc959.c:599 lib/sshv2.c:995
+#: 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:310
-#, c-format
-msgid "Starting the file transfer at offset %lld\n"
-msgstr "กำลังเริ่มต้นถ่ายโอนไฟล์ที่ออฟเซต %lld\n"
-
-#: lib/rfc2068.c:318
-#, c-format
-msgid "Starting the file transfer at offset %ld\n"
+#: lib/rfc2068.c:301
+#, fuzzy
+msgid "Starting the file transfer at offset "
 msgstr "กำลังเริ่มต้นถ่ายโอนไฟล์ที่ออฟเซต %ld\n"
 
-#: lib/rfc2068.c:340
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ไม่สามารถเรียกไฟล์กลับคืน %s\n"
 
-#: lib/rfc2068.c:442 lib/sshv2.c:1080
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "กำลังเรียกกลับคืนรายชื่อไดเรกทอรี...\n"
 
-#: lib/rfc2068.c:847 lib/sshv2.c:716 lib/sshv2.c:729 lib/sshv2.c:751
-#: lib/sshv2.c:819 lib/sshv2.c:951 lib/sshv2.c:1042 lib/sshv2.c:1110
-#: lib/sshv2.c:1223 lib/sshv2.c:1236 lib/sshv2.c:1249 lib/sshv2.c:1262
-#: lib/sshv2.c:1318 lib/sshv2.c:1383 lib/sshv2.c:1843 lib/sshv2.c:1946
-#: lib/sshv2.c:2040 lib/sshv2.c:2125 lib/sshv2.c:2211
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ได้รับการตอบสนองไม่ถูกต้องจากเซิร์ฟเวอร์, กำลังยกเลิกการเชื่อมต่อ\n"
 
@@ -913,11 +979,23 @@ msgid ""
 msgstr ""
 
 #: lib/rfc959.c:69
-msgid "Passive file transfers"
+msgid "Ignore PASV address"
 msgstr ""
 
 #: 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 ""
+
+#: lib/rfc959.c:74
+msgid "Passive file transfers"
+msgstr ""
+
+#: 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. "
 "Generally, it is a good idea to keep this enabled unless you are connecting "
@@ -926,11 +1004,11 @@ msgid ""
 "attempt to connect to it."
 msgstr ""
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr ""
 
-#: 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 "
@@ -938,83 +1016,144 @@ msgid ""
 "option to LIST"
 msgstr ""
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "ถ่ายโอนไฟล์ในรูปแบบ ASCII"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
 
-#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
-msgid "Received invalid response to PWD command: '%s'\n"
-msgstr "ได้รับการตอบสนองที่ไม่ถูกต้องจากคำสั่ง PWD: '%s'\n"
+msgid "Invalid response '%c' received from server.\n"
+msgstr ""
+
+#: 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:668 lib/rfc959.c:678
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "ไม่พบที่อยู่ IP ในการตอบสนอง PASV '%s'\n"
 
-#: lib/rfc959.c:693 lib/rfc959.c:848
+#: lib/rfc959.c:775
+#, fuzzy, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "ไม่พบที่อยู่ IP ในการตอบสนอง PASV '%s'\n"
+
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ไม่สามารถสร้างการเชื่อมต่อข้อมูล: %s\n"
 
-#: lib/rfc959.c:705 lib/rfc959.c:726 lib/rfc959.c:873
+#: 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:716 lib/rfc959.c:863
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "ไม่สามารถไบด์พอร์ต: %s\n"
 
-#: lib/rfc959.c:735 lib/rfc959.c:882
+#: 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:777
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "สร้าง IPv6ซ็อกเก็ตล้มเหลว: %s\n"
 
-#: lib/rfc959.c:797
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: lib/rfc959.c:826 lib/rfc959.c:835
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: lib/rfc959.c:892
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ไม่สามารถทราบค่าที่อยู่ของซ็อกเก็ตในเครื่องได้: %s\n"
 
-#: lib/rfc959.c:965
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ไม่สามารถยอมรับการเชื่อมต่อจากเซิร์ฟเวอร์: %s\n"
 
-#: lib/rfc959.c:1478
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "ทั้งหมด"
 
-#: lib/rfc959.c:1480
+#: 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 ""
+
+#: 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 "ไม่สามารถตั้งค่าซ็อกเก็ตให้เป็นแบบไม่มีจำกัด (non-blocking): %s\n"
+
 #: lib/sshv2.c:28
 msgid "SSH"
 msgstr "โพรโตคอล SSH"
@@ -1035,205 +1174,191 @@ msgstr "พารามิเตอร์พิเศษของโพรโต
 msgid "Extra parameters to pass to the SSH program"
 msgstr "พารามิเตอร์พิเศษเพื่อส่งผ่านไปยังโปรแกรม SSH"
 
-#: lib/sshv2.c:37
-msgid "SSH2 sftp-server path:"
-msgstr ""
-
-#: lib/sshv2.c:39
-#, fuzzy
-msgid "Default remote SSH2 sftp-server path"
-msgstr "เส้นทางปริยายของ SSH2 sftp-server ติดต่อไปยังเซิร์ฟเวอร์"
-
-#: lib/sshv2.c:41
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านของโพรโตคอล SSH"
 
-#: lib/sshv2.c:44
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "เรียกหาชื่อผู้ใช้หรือรหัสผ่านในการเชื่อมต่อโพรโตคอล SSH"
 
-#: lib/sshv2.c:45
-msgid "Use ssh-askpass utility"
+#: lib/sshv2.c:369
+#, c-format
+msgid "Running program %s\n"
+msgstr "โปรแกรมกำลังทำงาน %s\n"
+
+#: lib/sshv2.c:378
+msgid "Enter passphrase for RSA key"
 msgstr ""
 
-#: lib/sshv2.c:48
-#, fuzzy
-msgid "Use the ssh-askpass utility to supply the remote password"
-msgstr "ใช้อรรถประโยชน์ ssh-askpass เพื่อจับรหัสผ่านของผู้ใช้"
+#: lib/sshv2.c:379
+msgid "Enter passphrase for key '"
+msgstr ""
 
-#: lib/sshv2.c:50
-msgid "Use SSH2 SFTP subsys"
-msgstr "ใช้ระบบย่อยของโพรโตคอล SSH2 SFTP"
+#: lib/sshv2.c:380
+#, fuzzy
+msgid "Password"
+msgstr "รหัสผ่าน:"
 
-#: lib/sshv2.c:53
+#: lib/sshv2.c:381
 #, fuzzy
-msgid ""
-"Call ssh with the -s sftp flag. This is helpful because you won't have to "
-"know the remote path to the remote sftp-server"
+msgid "password"
+msgstr "รหัสผ่าน:"
+
+#: lib/sshv2.c:496
+msgid "(yes/no)?"
 msgstr ""
-"เรียก ssh ด้วยค่าสถานะ -s  ผ่านคำสั่ง sftp   "
-"เนื่องจากคุณไม่จำเป็นต้องรู้เส้นทางในการติดต่อไปยัง sftp-server ไปยังเซิร์ฟเวอร์"
 
-#: lib/sshv2.c:259
-#, c-format
-msgid "Running program %s\n"
-msgstr "โปรแกรมกำลังทำงาน %s\n"
+#: lib/sshv2.c:514
+msgid "Enter PASSCODE:"
+msgstr ""
 
-#: lib/sshv2.c:306 lib/sshv2.c:331
-msgid "WARNING"
-msgstr "คำเตือน"
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
+msgid "Enter Password"
+msgstr "ใส่รหัสผ่าน"
+
+#: lib/sshv2.c:519
+#, fuzzy
+msgid "Enter SecurID Password:"
+msgstr "ใส่รหัสผ่าน"
 
-#: lib/sshv2.c:373
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "ผิดพลาด: ใส่รหัสผ่านผิดพลาด\n"
 
-#: lib/sshv2.c:376
-msgid ""
-"Please connect to this host with the command line SSH utility and answer "
-"this question appropriately.\n"
-msgstr ""
-"โปรดเชื่อมต่อไปยังโฮสต์นี้โดยใช้บรรทัดคำสั่งอรรถประโยชน์ SSH และตอบคำถามนี้อย่างเหมาะสม\n"
-
-#: lib/sshv2.c:379
-msgid "Please correct the above warning to connect to this host.\n"
-msgstr "โปรดแก้ไขตามคำเตือนข้างต้นเพื่อเชื่อมต่อไปยังโฮสต์นี้\n"
-
-#: lib/sshv2.c:418
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: การเริ่มการเรียกใช้โพรโตคอล\n"
 
-#: lib/sshv2.c:424
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: รุ่นโพรโตคอล %d\n"
 
-#: lib/sshv2.c:433
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: เปิด %s\n"
 
-#: lib/sshv2.c:438
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: ปิด\n"
 
-#: lib/sshv2.c:444
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: เปิดไดเรกทอรี %s\n"
 
-#: lib/sshv2.c:449
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: อ่านไดเรกทอรี\n"
 
-#: lib/sshv2.c:453
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: ย้ายไฟล์ %s ออก\n"
 
-#: lib/sshv2.c:458
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: สร้างไดเรกทอรี %s\n"
 
-#: lib/sshv2.c:463
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: ย้ายไดเรกทอรี %s ออก\n"
 
-#: lib/sshv2.c:468
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: เส้นทางจริง %s\n"
 
-#: lib/sshv2.c:473
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: คุณสมบัติไฟล์\n"
 
-#: lib/sshv2.c:477
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: เริ่ม %s\n"
 
-#: lib/sshv2.c:494
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: เปลี่ยนสิทธิ์การเข้าถึงไฟล์ (Chmod) %s %o\n"
 
-#: lib/sshv2.c:499
+#: lib/sshv2.c:676
 #, fuzzy, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: วันและเวลาที่มีการแก้ไขโดยใช้การเรียกจากระบบ (Utime) %s %d\n"
 
-#: lib/sshv2.c:512 src/gtk/bookmarks.c:1017 src/gtk/bookmarks.c:1263
-#: src/gtk/chmod_dialog.c:281 src/gtk/gtkui_transfer.c:361
-#: src/gtk/misc-gtk.c:956 src/gtk/options_dialog.c:1109
-#: src/gtk/options_dialog.c:1311
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "ตกลง"
 
-#: lib/sshv2.c:515
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "สิ้นสุดไฟล์"
 
-#: lib/sshv2.c:518
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "ไม่มีไฟล์หรือไดเรกทอรีเช่นนี้"
 
-#: lib/sshv2.c:521
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "การเปลี่ยนสิทธิ์ได้รับการปฏิเสธ"
 
-#: lib/sshv2.c:524
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "ล้มเหลว"
 
-#: lib/sshv2.c:527
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "ข้อความไม่เป็นที่ยอมรับ"
 
-#: lib/sshv2.c:530
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "ไม่มีการเชื่อมต่อ"
 
-#: lib/sshv2.c:533
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "การเชื่อมต่อสูญหาย"
 
-#: lib/sshv2.c:536
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "การดำเนินการไม่ได้รับการสนับสนุน"
 
-#: lib/sshv2.c:539
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "ได้รับข้อความที่ไม่รู้จักจากเซิร์ฟเวอร์"
 
-#: lib/sshv2.c:576
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "ผิดพลาด: ขนาดข้อความ %d ใหญ่เกินไป\n"
 
-#: lib/sshv2.c:634 lib/sshv2.c:1119 lib/sshv2.c:1955 lib/sshv2.c:2049
-#: lib/sshv2.c:2137
+#: 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"
 
-#: lib/sshv2.c:640
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
 
-#: lib/sshv2.c:869
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "กำลังเปิดการเชื่อมต่อ SSH เพื่อติดต่อไปยัง %s\n"
 
-#: lib/sshv2.c:962
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "บันทึกข้อมูลไปยัง SSH ที่เซิร์ฟเวอร์  %s ได้สำเร็จ\n"
@@ -1258,7 +1383,11 @@ msgstr ""
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: lib/sslcommon.c:99
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
+msgid "Verify SSL Peer"
+msgstr ""
+
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1267,66 +1396,56 @@ msgid ""
 "Error %i:%s\n"
 msgstr ""
 
-#: lib/sslcommon.c:121
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr ""
 
-#: lib/sslcommon.c:180
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: lib/sslcommon.c:287
-msgid "Cannot initialized the OpenSSL library\n"
+#: lib/sslcommon.c:297
+msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: lib/sslcommon.c:302
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: lib/sslcommon.c:313
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: lib/sslcommon.c:332 lib/sslcommon.c:401 lib/sslcommon.c:448
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: lib/sslcommon.c:349
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:359
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: lib/sslcommon.c:377
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:61
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "รอ %d วินาที จนกว่าจะเชื่อมต่อใหม่อีกครั้ง\n"
-
-#: src/uicommon/gftpui.c:72 src/gtk/chmod_dialog.c:74
-#: src/gtk/delete_dialog.c:89 src/gtk/transfer.c:213
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "การดำเนินการถูกยกเลิก\n"
 
-#: src/uicommon/gftpui.c:146
-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 ""
-">.ถ้าคุณมีคำถาม ข้อคิดเห็น หรือคำแนะนำเกี่ยวกับโปรแกรมนี้ โปรดส่งอี-เมล์มายังเรา "
-"และคุณสามารถพบข่าวล่าสุดเกี่ยวกับ gFTP จากเวบไซต์ http://www.gftp.org/\n";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "รอ %d วินาที จนกว่าจะเชื่อมต่อใหม่อีกครั้ง\n"
 
-#: src/uicommon/gftpui.c:147
+#: 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 "
@@ -1335,73 +1454,73 @@ msgstr ""
 "โปรแกรม gFTP ไม่มีการรับประกันใดๆ; คุณสามารถดูรายละเอียดได้จากไฟล์สำเนา โปรแกรม gFTP "
 "เป็นซอฟต์แวร์เสรี คุณสามารถปรับปรุงใหม่ภายใต้เงื่อนไขที่กำหนด ซึ่งมีรายละเอียดอยู่ในไฟล์สำเนา\n"
 
-#: src/uicommon/gftpui.c:149 src/gtk/menu-items.c:495
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "แปลโดย"
 
-#: src/uicommon/gftpui.c:196 src/uicommon/gftpui.c:238
-#: src/uicommon/gftpui.c:278 src/uicommon/gftpui.c:313
-#: src/uicommon/gftpui.c:348 src/uicommon/gftpui.c:383
-#: src/uicommon/gftpui.c:419 src/uicommon/gftpui.c:482
-#: src/uicommon/gftpui.c:563 src/uicommon/gftpui.c:828
+#: 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:207
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:248
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:284
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:319
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:354
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:389
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:425 src/uicommon/gftpui.c:442
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:514
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:527
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "ลบแคชไดเรกทอรี\n"
 
-#: src/uicommon/gftpui.c:616
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr ""
 
-#: src/uicommon/gftpui.c:691
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr ""
 
-#: src/uicommon/gftpui.c:705
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "ผิดพลาด: ตัวแปร %s เป็นตัวแปรการปรับแต่งค่าที่ไม่ถูกต้อง\n"
 
-#: src/uicommon/gftpui.c:712
+#: 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:792
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1409,313 +1528,335 @@ msgstr ""
 "คำลั่งสนับสนุน:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:835
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "ใช้: %s <filespec>\n"
 
-#: src/uicommon/gftpui.c:920
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "เกี่ยวกับ"
 
-#: src/uicommon/gftpui.c:921
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "แสดงข้อมูล gFTP"
 
-#: src/uicommon/gftpui.c:922
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "แอสกี "
 
-#: src/uicommon/gftpui.c:923
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "ตั้งค่าโหมดถ่ายโอนไฟล์ปัจจุบันไปเป็นแอสกี (เฉพาะ FTP เท่านั้น)"
 
-#: src/uicommon/gftpui.c:924
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ฐานสอง"
 
-#: src/uicommon/gftpui.c:925
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "ตั้งค่าโหมดถ่ายโอนไฟล์ปัจจุบันไปเป็นฐานสอง (เฉพาะ FTP เท่านั้น)"
 
-#: src/uicommon/gftpui.c:926
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "เปลี่ยนไดเรกทอรี (cd)"
 
-#: src/uicommon/gftpui.c:927 src/uicommon/gftpui.c:929
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "เปลี่ยนไดเรกทอรีที่ใช้งานที่เครื่องทางไกล"
 
-#: src/uicommon/gftpui.c:928
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "เปลี่ยนไดเรกทอรี (chdir)"
 
-#: src/uicommon/gftpui.c:930
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "เปลี่ยนสิทธิ์การเข้าถึงไฟล์ (chmod)"
 
-#: src/uicommon/gftpui.c:931
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "เปลี่ยนสิทธิ์ที่อนุญาตของไฟล์ทางไกล"
 
-#: src/uicommon/gftpui.c:932
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "ล้าง"
 
-#: src/uicommon/gftpui.c:933
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "ตัวเลือกที่มีอยู่: แคช"
 
-#: src/uicommon/gftpui.c:934
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "ปิด"
 
-#: src/uicommon/gftpui.c:935
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "ยกเลิกการเชื่อมต่อจากไซต์ทางไกล"
 
-#: src/uicommon/gftpui.c:936
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "ลบ"
 
-#: src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "ย้ายไฟล์ทางไกลออก"
 
-#: src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:955
+#, fuzzy
+msgid "dir"
+msgstr "เปลี่ยนไดเรกทอรี (chdir)"
+
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
+msgid "Shows the directory listing for the current remote directory"
+msgstr "แสดงรายชื่อไดเรกทอรีปัจจุบันที่เครื่องทางไกล"
+
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "ได้รับ"
 
-#: src/uicommon/gftpui.c:939 src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "ดาว์นโหลดไฟล์ทางไกล"
 
-#: src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "ช่วยเหลือ"
 
-#: src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "แสดงหน้าจอช่วยเหลือ"
 
-#: src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "เปลี่ยนไดเรกทอรี (lcd)"
 
-#: src/uicommon/gftpui.c:943 src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "เปลี่ยนไดเรกทอรีที่ใช้งาน"
 
-#: src/uicommon/gftpui.c:944
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "เปลี่ยนไดเรกทอรีบนเครื่องที่ใช้ (lchdir)"
 
-#: src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "เปลี่ยนสิทธิ์การเข้าถึงไฟล์บนเครื่องที่ใช้ (lchmod)"
 
-#: src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "เปลี่ยนสิทธิ์ที่อนุญาตของไฟล์บนเครื่อง"
 
-#: src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:967
 #, fuzzy
 msgid "ldelete"
 msgstr "ลบไฟล์บนเครื่องที่ใช้ (ldelete)"
 
-#: src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "ย้ายไฟล์บนเครื่องที่ใช้"
 
-#: src/uicommon/gftpui.c:950
-#, fuzzy
-msgid "lls"
-msgstr "เรียกดูไฟล์ในไดเรกทอรีปัจจุบัน (lls)"
+#: src/uicommon/gftpui.c:969
+msgid "ldir"
+msgstr ""
 
-#: src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "แสดงรายชื่อไดเรกทอรีสำหรับไดเรกทอรีปัจจุบันบนเครื่อง"
 
-#: src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:971
+#, fuzzy
+msgid "lls"
+msgstr "เรียกดูไฟล์ในไดเรกทอรีปัจจุบัน (lls)"
+
+#: src/uicommon/gftpui.c:973
 #, fuzzy
 msgid "lmkdir"
 msgstr "สร้างไดเรกทอรี (lmkdir)"
 
-#: src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "สร้างไดเรกทอรีบนเครื่อง"
 
-#: src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:975
 #, fuzzy
 msgid "lpwd"
 msgstr "ตรวจสอบไดเรกทอรีบนเครื่องที่ใช้ (lpwd)"
 
-#: src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "แสดงไดเรกทอรีปัจจุบันบนเครื่อง"
 
-#: src/uicommon/gftpui.c:956
+#: src/uicommon/gftpui.c:977
 #, fuzzy
 msgid "lrename"
 msgstr "แก้ไขชื่อ (lrename)"
 
-#: src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "เปลี่ยนชื่อไฟล์บนเครื่อง"
 
-#: src/uicommon/gftpui.c:958
+#: src/uicommon/gftpui.c:979
 #, fuzzy
 msgid "lrmdir"
 msgstr "ลบไดเรกทอรี (lrmdir)"
 
-#: src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "ย้ายไดเรกทอรีบนเครื่อง"
 
-#: src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:981
 #, fuzzy
 msgid "ls"
 msgstr "เรียกดูไฟล์ในไดเรกทอรีปัจจุบัน (ls)"
 
-#: src/uicommon/gftpui.c:961
-msgid "Shows the directory listing for the current remote directory"
-msgstr "แสดงรายชื่อไดเรกทอรีปัจจุบันที่เครื่องทางไกล"
-
-#: src/uicommon/gftpui.c:962
+#: src/uicommon/gftpui.c:983
 #, fuzzy
 msgid "mget"
 msgstr "ดาว์นโหลดไฟล์มายังเครื่องที่ใช้มากกว่า 1 ไฟล์ (mget)"
 
-#: src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:985
 #, fuzzy
 msgid "mkdir"
 msgstr "สร้างไดเรกทอรี (mkdir)"
 
-#: src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "สร้างไดเรกทอรีที่เครื่องทางไกล"
 
-#: src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:987
 #, fuzzy
 msgid "mput"
 msgstr "อัพโหลดไฟล์ไปยังเครื่องทางไกลมากกว่า 1 ไฟล์ (mput)"
 
-#: src/uicommon/gftpui.c:967 src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "อัพโหลดไฟล์บนเครื่องที่ใช้"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "เปิด"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "เปิดการเชื่อมต่อไปยังไซต์ทางไกล"
 
-#: src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:991
 #, fuzzy
 msgid "put"
 msgstr "อัพโหลดไฟล์ไปยังเครื่องทางไกล 1 ไฟล์ (put)"
 
-#: src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:993
 #, fuzzy
 msgid "pwd"
 msgstr "ตรวจสอบไดเรกทอรีปัจจุบัน (pwd)"
 
-#: src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "แสดงไดเรกทอรีปัจจุบันของเครื่องทางไกล"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "ออก"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "ออกจากโปรแกรม gFTP"
 
-#: src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "เปลี่ยนชื่อไฟล์ที่เครื่องทางไกล"
 
-#: src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:999
 #, fuzzy
 msgid "rmdir"
 msgstr "ลบไดเรกทอรี (rmdir)"
 
-#: src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "ย้ายไดเรกทอรีทางไกล"
 
-#: src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "ตั้งค่า"
 
-#: src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "แสดงตัวแปรไฟล์การปรับแต่งค่า คุณสามารถตั้งค่าตัวแปรได้โดยกำหนด var=val"
 
-#: src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:1004
 #, fuzzy
 msgid "site"
 msgstr "ไซต์"
 
-#: src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "ใส่คำสั่งระบุไซต์"
 
-#: src/uicommon/gftpui.c:1074
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "ผิดพลาด: เป็นคำสั่งที่ไม่รู้จัก\n"
 
-#: src/uicommon/gftpui.c:1324
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "ผิดพลาด: ไซต์ทางไกลถูกยกเลิกการเชื่อมต่อ หลังจากที่พยายามถ่ายโอนไฟล์\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "ถ่ายโอน %s ได้สำเร็จ ที่ %.2f กิโลไบต์/วินาที\n"
+
+#: src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "กำลังข้ามไฟล์ %s บนโฮสต์ %s\n"
+
+#: src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "กำลังหยุดการถ่ายโอนบนโฮสต์ %s\n"
 
-#: src/uicommon/gftpui.c:1390
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s จาก %s\n"
 
-#: src/uicommon/gftpui.c:1413
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "ถ่ายโอน %s ได้สำเร็จ ที่ %.2f กิโลไบต์/วินาที\n"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: src/gtk/bookmarks.c:39 src/gtk/gftp-gtk.c:194 src/gtk/gftp-gtk.c:1009
-#: src/gtk/misc-gtk.c:478 src/gtk/misc-gtk.c:486
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: โปรดกดปุ่มหยุดก่อนที่จะทำสิ่งอื่นต่อไป\n"
 
-#: src/gtk/bookmarks.c:40
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "เรียกบุ๊กมาร์กทำงาน"
 
-#: src/gtk/bookmarks.c:70
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "เพิ่มบุ๊กมาร์ก: คุณต้องใส่ชื่อบุ๊กมาร์ก\n"
 
-#: src/gtk/bookmarks.c:77
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "เพิ่มบุ๊กมาร์ก: ไม่สามารถเพิ่มบุ๊กมาร์ก %s เนื่องจากมีอยู่แล้ว\n"
 
-#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "เพิ่มบุ๊กมาร์ก"
 
-#: src/gtk/bookmarks.c:141
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "เพิ่มบุ๊กมาร์ก: คุณต้องใส่ชื่อโฮสต์\n"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1725,135 +1866,139 @@ msgstr ""
 " คุณสามารถคั่นรายการด้วย / เพื่อใส่ลงในเมนูย่อย\n"
 "(เช่น: ไซต์ลีนุกต์/เดเบียน)"
 
-#: src/gtk/bookmarks.c:145
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "จดจำรหัสผ่าน"
 
-#: src/gtk/bookmarks.c:471 src/gtk/bookmarks.c:481
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "เพิ่มบุ๊กมาร์ก: คุณต้องใส่ชื่อบุ๊กมาร์ก\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "โฟลเดอร์ใหม่"
 
-#: src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "ใส่ชื่อของโฟลเดอร์ใหม่ที่จะสร้าง"
 
-#: src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/ไฟล์/รายการใหม่..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "ใส่ชื่อของรายการใหม่ที่จะสร้าง"
 
-#: src/gtk/bookmarks.c:555
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "คุณแน่ใจหรือไม่ว่าคุณต้องการลบบุ๊กมาร์ก\n"
 " %s และรายการย่อยในนั้นทั้งหมด?"
 
-#: src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "ลบบุ๊กมาร์ก"
 
-#: src/gtk/bookmarks.c:583
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "บุ๊กมาร์ก"
 
-#: src/gtk/bookmarks.c:823 src/gtk/bookmarks.c:826
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "แก้ไขรายการ"
 
-#: src/gtk/bookmarks.c:863
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "รายละเอียด:"
 
-#: src/gtk/bookmarks.c:878
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "ชื่อโฮสต์:"
 
-#: src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "พอร์ต:"
 
-#: src/gtk/bookmarks.c:908
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "โพรโตคอล:"
 
-#: src/gtk/bookmarks.c:932
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "ไดเรกทอรีทางไกล:"
 
-#: src/gtk/bookmarks.c:945
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "ไดเรกทอรีบนเครื่อง:"
 
-#: src/gtk/bookmarks.c:962
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#: src/gtk/bookmarks.c:975 src/text/textui.c:82
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gtk/bookmarks.c:989
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "บัญชีผู้ใช้:"
 
-#: src/gtk/bookmarks.c:1003
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "เข้าสู่ระบบโดยไม่ระบุชื่อ"
 
-#: src/gtk/bookmarks.c:1029 src/gtk/bookmarks.c:1273
-#: src/gtk/chmod_dialog.c:293 src/gtk/gtkui_transfer.c:373
-#: src/gtk/options_dialog.c:1120 src/gtk/options_dialog.c:1322
-msgid "  Cancel  "
-msgstr "  ยกเลิก  "
-
-#: src/gtk/bookmarks.c:1039 src/gtk/options_dialog.c:1333
-msgid "Apply"
-msgstr "ประยุกต์"
-
-#: src/gtk/bookmarks.c:1189
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/ไฟล์ (_F)"
 
-#: src/gtk/bookmarks.c:1190
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/ไฟล์/tearoff"
 
-#: src/gtk/bookmarks.c:1191
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/ไฟล์/โฟลเดอร์ใหม่..."
 
-#: src/gtk/bookmarks.c:1192
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/ไฟล์/รายการใหม่..."
 
-#: src/gtk/bookmarks.c:1193
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/ไฟล์/ลบ"
 
-#: src/gtk/bookmarks.c:1194
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/ไฟล์/คุณสมบัติ..."
 
-#: src/gtk/bookmarks.c:1195
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/ไฟล์/sep"
 
-#: src/gtk/bookmarks.c:1196
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/ไฟล์/ปิด"
 
-#: src/gtk/bookmarks.c:1207 src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "แก้ไขบุ๊กมาร์ก"
 
-#: src/gtk/chmod_dialog.c:160 src/gtk/chmod_dialog.c:165
-#: src/gtk/chmod_dialog.c:170
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "เปลี่ยนสิทธิ์การเข้าถึงไฟล์ (Chmod)"
 
-#: src/gtk/chmod_dialog.c:190
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1861,76 +2006,90 @@ msgstr ""
 "คุณสามารถปรับเปลี่ยนคุณลักษณะไฟล์ของคุณในตอนนี้\n"
 " หมายเหตุ: ไม่ใช่เซิร์ฟเวอร์ ftp ทั้งหมดจะสนับสนุนคุณสมบัติ chmod "
 
-#: src/gtk/chmod_dialog.c:200
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "พิเศษ"
 
-#: src/gtk/chmod_dialog.c:208
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:212
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:216
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/chmod_dialog.c:220 src/gtk/gftp-gtk.c:693
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: src/gtk/chmod_dialog.c:228 src/gtk/chmod_dialog.c:248
-#: src/gtk/chmod_dialog.c:268
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "อ่าน"
 
-#: src/gtk/chmod_dialog.c:232 src/gtk/chmod_dialog.c:252
-#: src/gtk/chmod_dialog.c:272
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "เขียน"
 
-#: src/gtk/chmod_dialog.c:236 src/gtk/chmod_dialog.c:256
-#: src/gtk/chmod_dialog.c:276
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "ประมวลผล"
 
-#: src/gtk/chmod_dialog.c:240 src/gtk/gftp-gtk.c:694
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "กลุ่ม"
 
-#: src/gtk/chmod_dialog.c:260
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: src/gtk/delete_dialog.c:156
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบไฟล์ %ld ไฟล์ และ %ld ไดเรกทอรีเหล่านี้"
 
-#: src/gtk/delete_dialog.c:158
+#: src/gtk/delete_dialog.c:65
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld files"
+msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบไฟล์ %ld ไฟล์ และ %ld ไดเรกทอรีเหล่านี้"
+
+#: src/gtk/delete_dialog.c:69
+#, fuzzy, c-format
+msgid "Are you sure you want to delete these %ld directories"
+msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบไฟล์ %ld ไฟล์ และ %ld ไดเรกทอรีเหล่านี้"
+
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "ลบไฟล์/ไดเรกทอรี"
 
-#: src/gtk/delete_dialog.c:176 src/gtk/options_dialog.c:1194
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "ลบ"
 
-#: src/gtk/dnd.c:146 src/gtk/dnd.c:233
-msgid "Drag-N-Drop"
-msgstr "ลากแล้วปล่อย"
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
+msgid "Connect"
+msgstr "เชื่อมต่อ"
 
-#: src/gtk/dnd.c:255
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "ได้รับ URL แล้ว %s\n"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
+msgid "Drag-N-Drop"
+msgstr "ลากแล้วปล่อย"
+
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "ออกจากโปรแกรม"
 
-#: src/gtk/gftp-gtk.c:113
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -1938,629 +2097,665 @@ msgstr ""
 "ขณะนี้กำลังทำการถ่ายโอนไฟล์อยู่\n"
 " คุณแน่ใจว่าต้องการออกจากโปรแกรม?"
 
-#: src/gtk/gftp-gtk.c:179
-msgid "Connect via URL"
-msgstr "เชื่อมต่อโดย URL"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "ตัวเลือก"
 
-#: src/gtk/gftp-gtk.c:179
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "ใส่ URL เพื่อเชื่อมต่อไป"
 
-#: src/gtk/gftp-gtk.c:195
-msgid "OpenURL"
-msgstr "เปิด URL"
-
-#: src/gtk/gftp-gtk.c:218
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP(_F)"
 
-#: src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:220
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/หน้าต่าง 1"
 
-#: src/gtk/gftp-gtk.c:221
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/หน้าต่าง 2"
 
-#: src/gtk/gftp-gtk.c:222 src/gtk/gftp-gtk.c:225 src/gtk/gftp-gtk.c:228
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: src/gtk/gftp-gtk.c:223
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/แอสกี"
 
-#: src/gtk/gftp-gtk.c:224
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/ไบนารี"
 
-#: src/gtk/gftp-gtk.c:226
-msgid "/FTP/_Options..."
-msgstr "/FTP/ตัวเลือก (_O)..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/ไฟล์/คุณสมบัติ..."
 
-#: src/gtk/gftp-gtk.c:229
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/ออก (_Q)"
 
-#: src/gtk/gftp-gtk.c:230
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/เครื่องที่ใช้ (_L)"
 
-#: src/gtk/gftp-gtk.c:231
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/เครื่องที่ใช้/tearoff"
 
-#: src/gtk/gftp-gtk.c:232
-msgid "/Local/Open _URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/เครื่องที่ใช้/เปิด _URL (_U)..."
 
-#: src/gtk/gftp-gtk.c:233
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/เครื่องที่ใช้/ยกเลิกการเชื่อมต่อ"
 
-#: src/gtk/gftp-gtk.c:234 src/gtk/gftp-gtk.c:240
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/เครื่องที่ใช้/sep"
 
-#: src/gtk/gftp-gtk.c:235
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/เครื่องที่ใช้/เปลี่ยนการเรียกดูไฟล์ตามรูปแบบที่กำหนด"
 
-#: src/gtk/gftp-gtk.c:236
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/เครื่องที่ใช้/แสดงที่ถูกเลือกไว้"
 
-#: src/gtk/gftp-gtk.c:237
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/เครื่องที่ใช้/เลือกทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:238
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/เครื่องที่ใช้/เลือกไฟล์ทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:239
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/เครื่องที่ใช้/ยกเลิกการเลือกทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:241
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/เครื่องที่ใช้/บันทึกรายชื่อในไดเรกทอรีที่กำลังใช้งาน..."
 
-#: src/gtk/gftp-gtk.c:242
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/เครื่องที่ใช้/ส่งSITE..."
 
-#: src/gtk/gftp-gtk.c:243
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/เครื่องที่ใช้/เปลี่ยนไดเรกทอรี"
 
-#: src/gtk/gftp-gtk.c:244
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/เครื่องที่ใช้/Chmod..."
 
-#: src/gtk/gftp-gtk.c:245
-msgid "/Local/Make Directory..."
-msgstr "/เครื่องที่ใช้/สร้างไดเรกทอรี..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/ไฟล์/โฟลเดอร์ใหม่..."
 
-#: src/gtk/gftp-gtk.c:246
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/เครื่องที่ใช้/เปลี่ยนชื่อ..."
 
-#: src/gtk/gftp-gtk.c:247
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/เครื่องที่ใช้/ลบ..."
 
-#: src/gtk/gftp-gtk.c:248
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/เครื่องที่ใช้/แก้ไข..."
 
-#: src/gtk/gftp-gtk.c:249
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/เครื่องที่ใช้/แสดง..."
 
-#: src/gtk/gftp-gtk.c:250
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/เครื่องที่ใช้/เรียกใหม่"
 
-#: src/gtk/gftp-gtk.c:251
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/เครื่องทางไกล (_R)"
 
-#: src/gtk/gftp-gtk.c:252
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/เครื่องทางไกล/tearoff"
 
-#: src/gtk/gftp-gtk.c:253
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/เครื่องทางไกล/เปิด _URL(_U)..."
 
-#: src/gtk/gftp-gtk.c:255
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/เครื่องทางไกล/ยกเลิกการเชื่อมต่อ"
 
-#: src/gtk/gftp-gtk.c:257 src/gtk/gftp-gtk.c:263
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/เครื่องทางไกล/sep"
 
-#: src/gtk/gftp-gtk.c:258
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/เครื่องทางไกล/เปลี่ยนการกำหนดรูปแบบของไฟล์"
 
-#: src/gtk/gftp-gtk.c:259
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/เครื่องทางไกล/แสดงที่เลือกไว้"
 
-#: src/gtk/gftp-gtk.c:260
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/เครื่องทางไกล/เลือกทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/เครื่องทางไกล/เลือกไฟล์ทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:262
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/เครื่องทางไกล/ยกเลิกการเลือกทั้งหมด"
 
-#: src/gtk/gftp-gtk.c:264
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/เครื่องทางไกล/บันทึกรายชื่อในไดเรกทอรีที่กำลังใช้งาน..."
 
-#: src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/เครื่องทางไกล/ส่งSITE..."
 
-#: src/gtk/gftp-gtk.c:266
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/เครื่องทางไกล/เปลี่ยนไดเรกทอรี"
 
-#: src/gtk/gftp-gtk.c:267
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/เครื่องทางไกล/Chmod..."
 
-#: src/gtk/gftp-gtk.c:268
-msgid "/Remote/Make Directory..."
-msgstr "/เครื่องทางไกล/สร้างไดเรกทอรี"
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/ไฟล์/โฟลเดอร์ใหม่..."
 
-#: src/gtk/gftp-gtk.c:269
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/เครื่องทางไกล/เปลี่ยนชื่อ..."
 
-#: src/gtk/gftp-gtk.c:270
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/เครื่องทางไกล/ลบ.."
 
-#: src/gtk/gftp-gtk.c:271
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/เครื่องทางไกล/แก้ไข..."
 
-#: src/gtk/gftp-gtk.c:272
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/เครื่องทางไกล/แสดง..."
 
-#: src/gtk/gftp-gtk.c:273
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/เครื่องทางไกล/เรียกใหม่"
 
-#: src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/บุ๊กมาร์ก (_B)"
 
-#: src/gtk/gftp-gtk.c:275
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/บุ๊กมาร์ก/tearoff"
 
-#: src/gtk/gftp-gtk.c:276
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/บุ๊กมาร์ก/เพิ่มบุ๊กมาร์ก"
 
-#: src/gtk/gftp-gtk.c:278
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/บุ๊กมาร์ก/แก้ไขบุ๊กมาร์ก"
 
-#: src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/บุ๊กมาร์ก/sep"
 
-#: src/gtk/gftp-gtk.c:280
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/ถ่ายโอน (_T)"
 
-#: src/gtk/gftp-gtk.c:281
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/ถ่ายโอน/tearoff"
 
-#: src/gtk/gftp-gtk.c:282
-msgid "/Transfers/Start Transfer"
-msgstr "/ถ่ายโอน/เริ่มการถ่ายโอน"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/ถ่ายโอน/tearoff"
 
-#: src/gtk/gftp-gtk.c:283
-msgid "/Transfers/Stop Transfer"
-msgstr "/ถ่ายโอน/หยุดการถ่ายโอน"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/ถ่ายโอน/sep"
 
-#: src/gtk/gftp-gtk.c:285 src/gtk/gftp-gtk.c:293
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/ถ่ายโอน/sep"
 
-#: src/gtk/gftp-gtk.c:286
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/ถ่ายโอน/ข้ามไฟล์ปัจจุบัน"
 
-#: src/gtk/gftp-gtk.c:287
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/ถ่ายโอน/ย้ายไฟล์ออก"
 
-#: src/gtk/gftp-gtk.c:289
-msgid "/Transfers/Move File _Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/ถ่ายโอน/ย้ายไฟล์ไปอยู่ระดับสูงกว่าเดิม (_U)"
 
-#: src/gtk/gftp-gtk.c:291
-msgid "/Transfers/Move File _Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/ถ่ายโอน/ย้ายไฟล์ไปอยู่ระดับต่ำกว่าเดิม (_D)"
 
-#: src/gtk/gftp-gtk.c:294
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/ถ่ายโอน/เรียกคืนไฟล์"
 
-#: src/gtk/gftp-gtk.c:295
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/ถ่ายโอน/วางไฟล์"
 
-#: src/gtk/gftp-gtk.c:296
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/การติดตามการทำงาน (_O)"
 
-#: src/gtk/gftp-gtk.c:297
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/การติดตามการทำงาน/tearoff"
 
-#: src/gtk/gftp-gtk.c:298
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/การติดตามการทำงาน/ลบ"
 
-#: src/gtk/gftp-gtk.c:299
-msgid "/Logging/View log..."
-msgstr "/การติดตามการทำงาน/แสดงการบันทึกการปฏิบัติการ..."
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/เครื่องที่ใช้/แสดง..."
 
-#: src/gtk/gftp-gtk.c:300
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/การติดตามการทำงาน/บันทึกการปฏิบัติการ..."
 
-#: src/gtk/gftp-gtk.c:301
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/เครื่องมือ (_S)"
 
-#: src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/เครื่องมือ/tearoff"
 
-#: src/gtk/gftp-gtk.c:303
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/เครื่องมือ/หน้าต่างเปรียบเทียบ"
 
-#: src/gtk/gftp-gtk.c:304
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/เครื่องมือ/ลบแคช"
 
-#: src/gtk/gftp-gtk.c:305
-msgid "/_Help"
+#: src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Help"
 msgstr "/ช่วยเหลือ (_H)"
 
-#: src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/ช่วยเหลือ/tearoff"
 
-#: src/gtk/gftp-gtk.c:307
-msgid "/Help/About..."
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/ช่วยเหลือ/เกี่ยวกับ..."
 
-#: src/gtk/gftp-gtk.c:425
-msgid "Host: "
+#: src/gtk/gftp-gtk.c:485
+#, fuzzy
+msgid "_Host: "
 msgstr "โฮสต์:"
 
-#: src/gtk/gftp-gtk.c:443
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "พอร์ต:"
 
-#: src/gtk/gftp-gtk.c:461
-msgid "User: "
+#: src/gtk/gftp-gtk.c:528
+#, fuzzy
+msgid "_User: "
 msgstr "ผู้ใช้:"
 
-#: src/gtk/gftp-gtk.c:479
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "รหัสผ่าน:"
 
-#: src/gtk/gftp-gtk.c:548
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr ""
 
-#: src/gtk/gftp-gtk.c:691 src/gtk/gftp-gtk.c:898 src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "ชื่อไฟล์"
 
-#: src/gtk/gftp-gtk.c:692
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "ขนาด"
 
-#: src/gtk/gftp-gtk.c:695
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "วันที่"
 
-#: src/gtk/gftp-gtk.c:696
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "คุณลักษณะ"
 
-#: src/gtk/gftp-gtk.c:899
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "ความก้าวหน้า"
 
-#: src/gtk/gftp-gtk.c:1010 src/gtk/misc-gtk.c:891 src/gtk/misc-gtk.c:965
-msgid "Connect"
-msgstr "เชื่อมต่อ"
-
-#: src/gtk/gftp-gtk.c:1040
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "ผิดพลาด: คุณต้องพิมพ์ลงในโฮสต์เพื่อเชื่อมต่อไปยัง\n"
 
-#: src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "เรียกใหม่"
 
-#: src/gtk/gtkui.c:93
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "ชื่อผู้ใช้:"
 
-#: src/gtk/gtkui.c:94
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "โปรดใสชื่อผู้ใช้ของคุณสำหรับไซต์นี้"
 
-#: src/gtk/gtkui.c:115 src/gtk/transfer.c:508 src/gtk/transfer.c:519
-msgid "Enter Password"
-msgstr "ใส่รหัสผ่าน"
-
-#: src/gtk/gtkui.c:116 src/gtk/transfer.c:509 src/gtk/transfer.c:520
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "โปรดใส่รหัสผ่านของคุณสำหรับไซต์นี้"
 
-#: src/gtk/gtkui.c:272
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "การดำเนินการถูกยกเลิก...คุณต้องใส่ชุดตัวอักษร\n"
 
-#: src/gtk/gtkui.c:310
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "สร้างไดเรกทอรี (Mkdir)"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "สร้างไดเรกทอรี"
 
-#: src/gtk/gtkui.c:313
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "ใส่ชื่อของไดเรกทอรีที่จะสร้าง"
 
-#: src/gtk/gtkui.c:336 src/gtk/gtkui.c:348 src/gtk/misc-gtk.c:894
-#: src/gtk/misc-gtk.c:968
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: src/gtk/gtkui.c:346
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "คุณต้องการจะเปลี่ยนชื่อ %s เป็นอะไร?"
 
-#: src/gtk/gtkui.c:368 src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "ไซต์"
 
-#: src/gtk/gtkui.c:371
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "ใส่คำสั่งระบุไซต์"
 
-#: src/gtk/gtkui.c:409 src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:394
+msgid "Prepend with SITE"
+msgstr ""
+
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 #, fuzzy
 msgid "Chdir"
 msgstr "เปลี่ยนไดเรกทอรี (Chdir)"
 
-#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:403 src/gtk/transfer.c:486
-#: src/gtk/transfer.c:963
+#: 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:465 src/gtk/transfer.c:490
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "กำลังรอ..."
 
-#: src/gtk/gtkui_transfer.c:124 src/gtk/gtkui_transfer.c:299
-#: src/gtk/gtkui_transfer.c:326
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "เขียนทับ"
 
-#: src/gtk/gtkui_transfer.c:131 src/gtk/gtkui_transfer.c:305
-#: src/gtk/gtkui_transfer.c:332
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "เริ่มต้นทำงานใหม่"
 
-#: src/gtk/gtkui_transfer.c:138 src/gtk/gtkui_transfer.c:302
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "ข้าม"
 
-#: src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "ดำเนินการ"
 
-#: src/gtk/gtkui_transfer.c:224 src/gtk/gtkui_transfer.c:233
-#: src/gtk/transfer.c:92
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "ถ่ายโอนไฟล์"
 
-#: src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
 msgstr "ไฟล์ที่กล่าวถึงอยู่นี้มีอยู่ทั้งในเครื่องที่ใช้และเครื่องทางไกล โปรดเลือกว่าอะไรที่คุณอยากให้ทำ"
 
-#: src/gtk/gtkui_transfer.c:308
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr ""
 
-#: src/gtk/gtkui_transfer.c:338
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "ข้ามไฟล์"
 
-#: src/gtk/gtkui_transfer.c:348
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
-#: src/gtk/gtkui_transfer.c:354
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "ไม่เลือกทั้งหมด"
 
-#: src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "เปลี่ยนการกำหนดรูปแบบของไฟล์: การดำเนินการถูกยกเลิก...คุณต้องใส่ชุดตัวอักษร\n"
 
-#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "เปลี่ยนแปลงการกำหนดไฟลรูปแบบของไฟล์"
 
-#: src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "ใส่การกำหนดไฟล์ใหม่"
 
-#: src/gtk/menu-items.c:105 src/gtk/menu-items.c:313 src/gtk/menu-items.c:371
-#: src/gtk/view_dialog.c:76 src/gtk/view_dialog.c:143
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถเปิด %s ในการเขียนได้: %s\n"
 
-#: src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "บันทึกรายชื่อในไดเรกทอรีที่กำลังใช้งาน"
 
-#: src/gtk/menu-items.c:337 src/gtk/menu-items.c:395
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "ผิดพลาด: ผิดพลาดขณะเขียนไปยัง %s: %s\n"
 
-#: src/gtk/menu-items.c:406
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "เขียนไฟล์การบันทึกการปฏิบัติการไปยัง %s ได้สำเร็จ\n"
 
-#: src/gtk/menu-items.c:418
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "บันทึกการปฏิบัติการ"
 
-#: src/gtk/menu-items.c:454
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "ไม่พบไฟล์ข้อตกลงการอนุญาตใช้สิทธิ์สำเนา โปรดแน่ใจว่ามันไม่ได้อยู่ใน %s หรือใน %s"
 
-#: src/gtk/menu-items.c:458 src/gtk/menu-items.c:463
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "เกี่ยวกับ gFTP"
 
-#: src/gtk/menu-items.c:494
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "สงวนลิขสิทธิ์ (C) 1998-2002 Brian Masney <masneyb gftp org>\n"
 "โฮมเพจทางการ : http://www.gftp.org/\n";
 "โลโก้โดย: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: src/gtk/menu-items.c:506
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "เกี่ยวกับ"
 
-#: src/gtk/menu-items.c:555
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "ข้อตกลงการอนุญาตใช้สิทธิ์"
 
-#: src/gtk/menu-items.c:561 src/gtk/view_dialog.c:392
-msgid "  Close  "
-msgstr "  ปิด  "
-
-#: src/gtk/menu-items.c:643
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "หน้าต่างเปรียบเทียบ"
 
-#: src/gtk/misc-gtk.c:287
+#: src/gtk/misc-gtk.c:209
+#, fuzzy
+msgid "Disconnect from the remote server"
+msgstr "ยกเลิกการเชื่อมต่อจากไซต์ทางไกล"
+
+#: src/gtk/misc-gtk.c:213
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
+msgstr ""
+
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "ไฟล์ทั้งหมด"
 
-#: src/gtk/misc-gtk.c:294
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr ""
 
-#: src/gtk/misc-gtk.c:319
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "ไม่ได้ถูกเชื่อมต่อ"
 
-#: src/gtk/misc-gtk.c:405
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "การเปิดไฟล์ %s: %s ผิดพลาด\n"
 
-#: src/gtk/misc-gtk.c:494
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: ไม่ถูกเชื่อมต่อไปยังไซต์ทางไกล\n"
 
-#: src/gtk/misc-gtk.c:501
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: คุณสมบัตินี้ไม่มีอยู่ในการใช้โพรโตคอลนี้\n"
 
-#: src/gtk/misc-gtk.c:509
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: คุณต้องมีอย่างเพียงหนึ่งรายการที่เลือกไว้\n"
 
-#: src/gtk/misc-gtk.c:516
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: คุณต้องมีอย่างน้อยหนึ่งรายการที่เลือกไว้\n"
 
-#: src/gtk/misc-gtk.c:888 src/gtk/misc-gtk.c:962
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "เปลี่ยน"
 
-#: src/gtk/misc-gtk.c:959 src/gtk/options_dialog.c:1180
-msgid "Add"
-msgstr "เพิ่ม"
-
-#: src/gtk/misc-gtk.c:985
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: src/gtk/misc-gtk.c:1055
-msgid "  Yes  "
-msgstr "  ใช่  "
-
-#: src/gtk/misc-gtk.c:1065
-msgid "  No  "
-msgstr "  ไม่  "
-
-#: src/gtk/misc-gtk.c:1124
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "กำลังรับรายชื่อไดเรกทอรี"
 
-#: src/gtk/misc-gtk.c:1144
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  หยุด  "
 
-#: src/gtk/misc-gtk.c:1154
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2569,40 +2764,51 @@ msgstr ""
 "ได้รับ %ld ไดเรกทอรี\n"
 " และ %ld ไฟล์ "
 
-#: src/gtk/misc-gtk.c:1228
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP เกิดความผิดพลาด: ไม่พบไฟล์ %s ใน %s หรือ %s\n"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "แก้ไขโฮสต์"
 
-#: src/gtk/options_dialog.c:920
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "เพิ่มโฮสต์"
 
-#: src/gtk/options_dialog.c:952 src/gtk/options_dialog.c:1043
+#: src/gtk/options_dialog.c:939
+msgid "_Type:"
+msgstr ""
+
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "โดเมน"
 
-#: src/gtk/options_dialog.c:972
-msgid "Network Address"
+#: src/gtk/options_dialog.c:978
+#, fuzzy
+msgid "_Network address:"
 msgstr "ที่อยู่เครือข่าย"
 
-#: src/gtk/options_dialog.c:1005 src/gtk/options_dialog.c:1145
+#: src/gtk/options_dialog.c:1013
+#, fuzzy
+msgid "N_etmask:"
+msgstr "ค่าของหมายเลข IP (Netmask)"
+
+#: src/gtk/options_dialog.c:1056
+#, fuzzy
+msgid "_Domain:"
+msgstr "โดเมน"
+
+#: src/gtk/options_dialog.c:1133
 msgid "Netmask"
 msgstr "ค่าของหมายเลข IP (Netmask)"
 
-#: src/gtk/options_dialog.c:1151
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "โฮสต์เครื่องที่ใช้"
 
-#: src/gtk/options_dialog.c:1187 src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "แก้ไข"
-
-#: src/gtk/options_dialog.c:1249 src/gtk/options_dialog.c:1254
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "ตัวเลือก"
 
@@ -2610,35 +2816,40 @@ msgstr "ตัวเลือก"
 msgid "Receiving file names..."
 msgstr "กำลังรับชื่อไฟล์..."
 
-#: src/gtk/transfer.c:62 src/gtk/transfer.c:639
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gtk/transfer.c:100
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "เรียกไฟล์กลับคืน: ไม่ถูกเชื่อมต่อไปยังไซต์ทางไกล\n"
 
-#: src/gtk/transfer.c:315
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "ผิดพลาด: ส่วนย่อย %d  ส่งกลับคืน %d\n"
 
-#: src/gtk/transfer.c:318
+#: src/gtk/transfer.c:345
 #, fuzzy, c-format
 msgid "Child %d returned successfully\n"
 msgstr "ส่วนย่อย %d ส่งกลับคืนได้สำเร็จ\n"
 
-#: src/gtk/transfer.c:325
+#: src/gtk/transfer.c:352
+#, fuzzy, c-format
+msgid "Error: Child %d did not terminate properly\n"
+msgstr "ผิดพลาด: ส่วนย่อย %d  ส่งกลับคืน %d\n"
+
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "ผิดพลาด: ไม่สามารถรับข้อมูลเกี่ยวกับไฟล์ %s: %s\n"
 
-#: src/gtk/transfer.c:330
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "ไฟล์ %s ไม่มีการเปลี่ยนแปลง\n"
 
-#: src/gtk/transfer.c:338
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2647,122 +2858,222 @@ msgstr ""
 "ไฟล์ %s มีการเปลี่ยนแปลง\n"
 " คุณต้องการที่จะอัพโหลดใช่หรือไม่?"
 
-#: src/gtk/transfer.c:341
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "แก้ไขไฟล์"
 
-#: src/gtk/transfer.c:406
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "เสร็จแล้ว"
 
-#: src/gtk/transfer.c:446
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "กำลังหยุดการถ่ายโอนจาก %s\n"
-
-#: src/gtk/transfer.c:683
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
-msgstr "เรียบร้อยแล้ว %d%%, เวลาที่เหลือโดยประมาณ %02d:%02d:%02d (%ld จาก %ld ไฟล์ )"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr "ได้รับ %s จาก %s ที่ %.2f กิโลไบต์/วินาที, ยังต้องใช้เวลาอีกประมาณ %02d:%02d:%02d"
 
-#: src/gtk/transfer.c:713
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "ได้รับ %s จาก %s ที่ %.2f กิโลไบต์/วินาที, ยังต้องใช้เวลาอีกประมาณ %02d:%02d:%02d"
 
-#: src/gtk/transfer.c:722
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr "ได้รับ %s จาก %s, ถ่ายโอนล่าช้า, ยังไม่ทราบเวลาที่เหลืออยู่"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "ได้รับ %s จาก %s, ถ่ายโอนล่าช้า, ยังไม่ทราบเวลาที่เหลืออยู่"
 
-#: src/gtk/transfer.c:757
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr ""
+
+#: 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 (%ld จาก %ld ไฟล์ )"
+
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "กำลังเรียกไฟล์กลับคืน...%s ไบต์"
 
-#: src/gtk/transfer.c:835 src/gtk/transfer.c:857 src/gtk/transfer.c:891
-#: src/gtk/transfer.c:931 src/gtk/transfer.c:984 src/gtk/transfer.c:1044
+#: 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"
 
-#: src/gtk/transfer.c:875
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "กำลังหยุดการถ่ายโอนบนโฮสต์ %s\n"
-
-#: src/gtk/transfer.c:916 src/gtk/transfer.c:969
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "กำลังข้ามไฟล์ %s บนโฮสต์ %s\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:34
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: 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:198
+#: 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
 #, fuzzy, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "มุมมอง: ไม่สามารถแตกเป็นกระบวนการย่อยเพื่อให้บริการได้: %s\n"
 
-#: src/gtk/view_dialog.c:201
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "โปรแกรมกำลังทำงาน: %s %s\n"
 
-#: src/gtk/view_dialog.c:259
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "กำลังเปิด %s ด้วย %s\n"
 
-#: src/gtk/view_dialog.c:294
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "กำลังแสดงไฟล์ %s\n"
 
-#: src/gtk/view_dialog.c:301
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "มุมมอง: ไม่สามารถเปิดไฟล์ %s: %s\n"
 
-#: src/text/gftp-text.c:169
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr ""
 
-#: src/text/textui.c:70
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "ชื่อผู้ใช้ [anonymous]:"
 
-#: src/text/textui.c:139
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 
-#~ msgid "Enter your email address here"
-#~ msgstr "ใส่ที่อยู่อีเมล์ของคุณได้ที่นี่"
+#~ msgid "Startup Directory:"
+#~ msgstr "ไดเรกทอรีเริ่มต้น:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "ไดเรกทอรีปริยายของ gFTP จะเริ่มการทำงาน"
+
+#~ msgid "Starting the file transfer at offset %lld\n"
+#~ msgstr "กำลังเริ่มต้นถ่ายโอนไฟล์ที่ออฟเซต %lld\n"
+
+#~ msgid "Received invalid response to PWD command: '%s'\n"
+#~ msgstr "ได้รับการตอบสนองที่ไม่ถูกต้องจากคำสั่ง PWD: '%s'\n"
+
+#, fuzzy
+#~ msgid "Default remote SSH2 sftp-server path"
+#~ msgstr "เส้นทางปริยายของ SSH2 sftp-server ติดต่อไปยังเซิร์ฟเวอร์"
+
+#, fuzzy
+#~ msgid "Use the ssh-askpass utility to supply the remote password"
+#~ msgstr "ใช้อรรถประโยชน์ ssh-askpass เพื่อจับรหัสผ่านของผู้ใช้"
+
+#~ msgid "Use SSH2 SFTP subsys"
+#~ msgstr "ใช้ระบบย่อยของโพรโตคอล SSH2 SFTP"
+
+#, fuzzy
+#~ msgid ""
+#~ "Call ssh with the -s sftp flag. This is helpful because you won't have to "
+#~ "know the remote path to the remote sftp-server"
+#~ msgstr ""
+#~ "เรียก ssh ด้วยค่าสถานะ -s  ผ่านคำสั่ง sftp   "
+#~ "เนื่องจากคุณไม่จำเป็นต้องรู้เส้นทางในการติดต่อไปยัง sftp-server ไปยังเซิร์ฟเวอร์"
 
-#~ msgid "Start file transfers"
-#~ msgstr "เริ่มการถ่ายโอนไฟล์"
+#~ msgid "WARNING"
+#~ msgstr "คำเตือน"
 
-#~ msgid "Automatically start the file transfers when they get queued?"
-#~ msgstr "เริ่มการถ่ายโอนไฟล์อัตโนมัติ เมื่อมีไฟล์อยู่ในคิวแล้ว"
+#~ msgid ""
+#~ "Please connect to this host with the command line SSH utility and answer "
+#~ "this question appropriately.\n"
+#~ msgstr ""
+#~ "โปรดเชื่อมต่อไปยังโฮสต์นี้โดยใช้บรรทัดคำสั่งอรรถประโยชน์ SSH และตอบคำถามนี้อย่างเหมาะสม\n"
+
+#~ msgid "Please correct the above warning to connect to this host.\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 ""
+#~ ">.ถ้าคุณมีคำถาม ข้อคิดเห็น หรือคำแนะนำเกี่ยวกับโปรแกรมนี้ โปรดส่งอี-เมล์มายังเรา "
+#~ "และคุณสามารถพบข่าวล่าสุดเกี่ยวกับ gFTP จากเวบไซต์ http://www.gftp.org/\n";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr "ผิดพลาด: ไซต์ทางไกลถูกยกเลิกการเชื่อมต่อ หลังจากที่พยายามถ่ายโอนไฟล์\n"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  ยกเลิก  "
+
+#~ msgid "Apply"
+#~ msgstr "ประยุกต์"
+
+#~ msgid "Connect via URL"
+#~ msgstr "เชื่อมต่อโดย URL"
+
+#~ msgid "OpenURL"
+#~ msgstr "เปิด URL"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/ตัวเลือก (_O)..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/เครื่องที่ใช้/สร้างไดเรกทอรี..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/เครื่องทางไกล/สร้างไดเรกทอรี"
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/ถ่ายโอน/เริ่มการถ่ายโอน"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/ถ่ายโอน/หยุดการถ่ายโอน"
+
+#~ msgid "/Logging/View log..."
+#~ msgstr "/การติดตามการทำงาน/แสดงการบันทึกการปฏิบัติการ..."
+
+#~ msgid "  Close  "
+#~ msgstr "  ปิด  "
+
+#~ msgid "Add"
+#~ msgstr "เพิ่ม"
+
+#~ msgid "Cancel"
+#~ msgstr "ยกเลิก"
+
+#~ msgid "  Yes  "
+#~ msgstr "  ใช่  "
+
+#~ msgid "  No  "
+#~ msgstr "  ไม่  "
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "กำลังหยุดการถ่ายโอนจาก %s\n"
+
+#~ msgid "Enter your email address here"
+#~ msgstr "ใส่ที่อยู่อีเมล์ของคุณได้ที่นี่"
 
 #~ msgid "Send PASV command or PORT command for data transfers"
 #~ msgstr "ส่งคำสั่ง PASV หรือ PORT ในการถ่ายโอนข้อมูล"
diff --git a/po/tr.po b/po/tr.po
index 3344f92..c27afef 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-06 02:06+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2011-03-29 17:42+0300\n"
 "Last-Translator: Muhammet Kara <muhammet k gmail com>\n"
 "Language-Team: Turkish <gnome-turk gnome org>\n"
@@ -18,40 +18,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Geçersiz URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Hata: Önbellek indeks dosyasında %s geçersiz satırı\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: lib/cache.c:138 lib/fsp.c:535 lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Hata: %s dizini oluşturulamadı: %s\n"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Hata: Geçici dosya oluşturulamadı: %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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Dosya belirteci kapatılırken hata oluştu: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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 "Hata: %s dosyası üzerinde arama yapılamadı: %s\n"
 
-#: ../lib/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
@@ -59,48 +58,48 @@ msgstr ""
 "'%s' dizgisini %s karakter kümesinden %s karakter kümesine dönüştürüken hata "
 "oluştu: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Hata: Yerel dosya %s açılamadı: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Hata: Sokete yazılamadı: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Hata: Soketten okunamadı: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: lib/config_file.c:183 lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP Hatası: %s dosyasında hatalı yer imleri\n"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Uyarı: Ana yer imi dosyası bulunamadı: %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: lib/config_file.c:203 lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP Hatası: Yer imi dosyası %s açılamadı: %s\n"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP Uyarısı: Yer imi dosyasında %d satır atlanıyor: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP Uyarısı: %d satırı yeterli argümana sahip değil\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -110,7 +109,7 @@ msgstr ""
 "sunucuya gidilmez. Kullanım: dont_use_proxy=.alanadı veya dont_use_proxy=ağ "
 "numarası/maskesi"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -118,54 +117,54 @@ msgstr ""
 "ext=dosya uzantısı:XPM dosyası:Ascii veya ikilik (A veya B):gösterici "
 "program. Not: Dosya uzantısı dışındaki argümanların kullanımı isteğe bağlıdır"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: lib/config_file.c:587 lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP Hatası: Hatalı yapılandırma dosyası %s\n"
 
-#: ../lib/config_file.c:598
+#: lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP Hatası: %s dizini yaratılamadı: %s\n"
 
-#: ../lib/config_file.c:608
+#: lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP Hatası: %s yapılandırma dosyası bulunamadı\n"
 
-#: ../lib/config_file.c:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Bir kurulum yaptınız mı?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: lib/config_file.c:619 lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP Hatası: Yapılandırma dosyası açılamadı %s: %s\n"
 
-#: ../lib/config_file.c:658
+#: lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr ""
 "Yapılandırma dosyasının %d. satırında meydana gelen ayrıştırma hataları "
 "nedeniyle sonlandırılıyor\n"
 
-#: ../lib/config_file.c:664
+#: lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP Uyarısı: Yapılandırma dosyasındaki %d satırı atlanıyor: %s\n"
 
-#: ../lib/config_file.c:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP Hatası: Hatalı kayıt dosyası %s\n"
 
-#: ../lib/config_file.c:677
+#: lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP Uyarısı: %s dosyası yazmak için açılamadı: %s\n"
 
-#: ../lib/config_file.c:732
+#: 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"
@@ -174,7 +173,7 @@ msgstr ""
 "<masneyb gftp org>. Uyarı: Bu dosyaya ekleyeceğiniz tüm yorumların üzerine "
 "yazılacaktır."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -186,7 +185,7 @@ msgstr ""
 "birisi tarafından kolaylıkla hatırlanmasını engellemek içindir. Bundan önce, "
 "tüm parolalar düz metin olarak saklanıyordu."
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -197,95 +196,94 @@ msgstr ""
 "üzerine yazılacaktır. Eğer bir girdinin yorumunda (*) varsa gFTP içinden "
 "değiştiremezsiniz"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<bilinmiyor>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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 ""
 "ÖLÜMCÜL gFTP Hatası:'%s' yapılandırma seçeneği genel tabloda bulunamadı\n"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Hata: %s dosyası gönderilemiyor\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Hata: %s dosyasına yazılamıyor: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Hata: Dosya kapatırken hata oluştu: %s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "%s FSP sunucusundan bozulmuş dosya listelemesi\n"
 
-#: ../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
+#: 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 "bilinmeyen"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "FSP dizin listelemesi %s alınamadı: %s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Dizin %s'e başarıyla değiştirildi\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Dizin %s'e değiştirilemedi\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s başarıyla silindi\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: lib/fsp.c:477 lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Hata: %s dizini silinemedi: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Hata: %s dosyası silinemedi: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "%s dizini başarıyla oluşturuldu\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:590
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s dosyasının adı %s'e başarıyla değiştirildi.\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:597
+#: lib/fsp.c:575 lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Hata: %s dosyasının adı %s yapılamadı: %s\n"
 
-#: ../lib/ftps.c:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -293,7 +291,7 @@ msgstr ""
 "SSL desteği derlenmemiş olduğundan FTPS desteği kullanılamaz. Bağlantı iptal "
 "ediliyor.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -301,107 +299,105 @@ msgstr ""
 "SSL desteği derlenmemiş olduğundan HTTPS desteği kullanılamaz. Bağlantı "
 "iptal ediliyor.\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Çalışma dizini bulunamıyor: %s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "Yerel dizin başarıyla değiştirildi: %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Yerel dizin %s'e değiştirilemedi: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Hata: Yerel dosya %s silinemedi: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Yerel dizin %s listesi alınamadı: %s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s'in kipi %o'e başarıyla değiştirildi\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Hata: %s 'in özellikleri %o 'e değiştirilemedi: %s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "%s'in zaman damgası başarıyla deiştirildi.\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "Hata: %s'in zaman damgası değiştirilemedi: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "yerel dosyasistemi"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "kullanımı: gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "hiçbiri"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "dosya"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "boyut"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "kullanıcı"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "grup"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "tarihzaman"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "nitelikler"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "azalan"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "artan"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "Genel"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "İzleme programı:"
 
-#: ../lib/options.h:44
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -409,27 +405,27 @@ msgstr ""
 "Dosyaları görüntülemek için kullanılacak öntanımlı dosya göstericisi. Eğer "
 "boş bırakılırsa dahili izleyici kullanılacaktır."
 
-#: ../lib/options.h:46
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Programı düzenle:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Dosyaları düzenlemek için kullanılan öntanımlı program."
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Azami Günlük Penceresi Boyutu:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "GTK+ portu için azami kayıt penceresi boyutu (bayt)"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Uzaktaki Karakter Kümeleri:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -437,11 +433,11 @@ msgstr ""
 "Uzak iletileri şu anki yerele çevirmek için denenecek karakter kümelerinin "
 "virgülle ayrılmış listesidir."
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Uzak LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -449,186 +445,190 @@ msgstr ""
 "Uzaktaki site için LC_TIME değeridir. Bu değer dizin listelerindeki "
 "tarihlerin düzgün ayrıştırılabilmesini sağlar."
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Önbellek TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr ""
 "Önbellek girdilerinin zaman aşımına uğramadan önce tutulacağı saniye sayısı."
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Dosya translferlerini üzerine ekle"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Yeni dosya transferlerini daha öncekilerin üzerine ekle"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Bir seferde bir dosya iletimi"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Bir seferde sadece bir dosya mı taşınsın?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Üzerine Yaz"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Dosyaların üzerine yaz veya iletime devam et"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Dosya izinlerini koru"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Aktarılan dosyaların izinlerini koru"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Dosyaların zaman bilgisini koru"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Aktarılan dosyaların zaman bilgisini koru"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Her dosya transferinden sonra yenile"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Her dosya transferinden sonra liste kutusunu yenile"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Önce dizinleri göster"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Önce dizinleri göster"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Gizli dosyaları göster"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Listedeki gizli dosyaları gösterir."
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Aktarım durumunu başlıkta göster"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Dosya aktarım durumunu başlık çubuğunda göster"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Dosya aktarımına başla"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Dosyalar kuyruğa eklendiği zaman, aktarımı otomatik olarak başla"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Grafik Kullanıcı Arabiriminde (GKA) elle girilen komutlara izin ver"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "GKA'da elle komut girilmesine izin ver (metin taşıma gibi işlevler)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "Son dizini hatırla"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "Uygulama kapatıldığında son yerel ve uzak dizinleri kaydet"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "Başlangıçta uzaktaki sunucuya bağlan"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "Uygulama başladığında uzaktaki sunucuya otomatik olarak bağlan."
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Ağ"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Ağ zaman aşımı:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Ağ girdi/çıktısı için zaman aşımı. Bu programı kullanma ile ilgili zaman "
 "aşımı değildir."
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Bağlantı tekrarları:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "Yapılacak otomatik tekrar deneme. Sürekli tekrar denemek için 0 girin"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tekrardan sonra bekleme süresi:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Bağlantı tekrarları arasındaki bekleme süresi"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Azami KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Bir dosya transferinin en yüksek hızı (kapatmak için 0 girin)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Aktarım Öbeği Boyutu:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Dosyaları aktarırken kullanılan öbek boyutu (block size). Bu değer 1024'ün "
 "katı olmalıdır."
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Öntanımlı İletişim Kuralı:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Kullanılacak öntanımlı protokolü belirler"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "IPv6 desteğini etkinleştir"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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"
@@ -636,27 +636,27 @@ msgstr ""
 "Dosya listesindeki bir dosya üzerine çift tıklanması halinde hangi işlemin "
 "gerçekleştileceğini belirler. 0=Dosyayı Aç 1=Dosyayı Düzenle 2=Dosyayı Al."
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Yerel dosya liste kutusunun öntanımlı genişliği"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Uzaktaki dosya liste kutusunun öntanımlı genişliği"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Yerel/uzak dosya liste kutusu öntanımlı boyutları"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Aktarma liste kutusunun öntanımlı yüksekliği"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Kayıt penceresinin öntanımlı yüksekliği"
 
-#: ../lib/options.h:177
+#: 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."
@@ -664,15 +664,15 @@ msgstr ""
 "Aktarma penceresinin dosya adı sütununun genişliği. 0 yapılırsa otomatik "
 "olarak boyutlandırılır."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Sıralanacak öntanımlı sütun"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Artan veya azalan şekilde sırala"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -680,7 +680,7 @@ msgstr ""
 "Dosya liste kutusundaki dosya adı sütununun genişliği. 0 yapılırsa otomatik "
 "olarak boyutlandırılır. -1 yapılırsa bu sütun gösterilmez."
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -689,7 +689,7 @@ msgstr ""
 "sütunların otomatik boyutlandırılmasını sağlayabilirsiniz. Eğer bu değer -1 "
 "ise bu sütun kapatılacaktır"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -698,7 +698,7 @@ msgstr ""
 "yaparak sütunların otomatik boyutlandırılmasını sağlayabilirsiniz. Eğer bu "
 "değer -1 ise bu sütun kapatılacaktır"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -707,7 +707,7 @@ msgstr ""
 "sütunların otomatik boyutlandırılmasını sağlayabilirsiniz. Eğer bu değer -1 "
 "ise bu sütun kapatılacaktır"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -716,7 +716,7 @@ msgstr ""
 "sütunların otomatik boyutlandırılmasını sağlayabilirsiniz. Eğer bu değer -1 "
 "ise bu sütun kapatılacaktır"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -725,75 +725,75 @@ msgstr ""
 "sütunların otomatik boyutlandırılmasını sağlayabilirsiniz. Eğer bu değer -1 "
 "ise bu sütun kapatılacaktır"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Sunucuya gönderilecek komutların renkleri"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Sunucudan alınacak komutların renkleri"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Hata mesajlarının renkleri"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Kalan kayıt mesajlarının renkleri"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "Yerel"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Yer imi"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Dosya transfer hızı %.2f Kb/s olarak ayarlandı\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "LC_TIME '%s' olarak ayarlanırken hata oluştu. '%s' e geri dönülüyor\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Dizin listesi %s arabellekten yükleniyor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Dizin listesi %s sunucudan yükleniyor (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -802,112 +802,112 @@ msgstr ""
 "Uyarı: '%s' dosyasınden yol bilgisi çıkarılıyor. Çıkarılan dosya yolu (%s), "
 "mevcut dizin (%s) ile eşleşmiyor\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Hata: Arabelleğe yazılamadı: %s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Hata: Yerimi bulunamıyor %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Yer İmi Hatası: %s yer iminin makine adı yok\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "'%s' iletişim kuralı şu anda desteklenmiyor.\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "Özyinelemeli sembolik bağlantı %s bulundu\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Hata: Uzak makine %s bağlantıyı kesti. Azami yeniden deneme sayısına "
 "ulaşıldı.\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Hata: Uzak makina %s bağlantıyı kesti. %d saniye içinde yeniden "
 "bağlanılıyor.\n"
 
-#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
-#: ../lib/socket-connect.c:126
+#: lib/protocols.c:1634 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 "Hata: Çalışma sonrası çıkış bayrağı atanamıyor: %s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "pty %s açılamadı: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Bir soket çifti yaratılamadı: %s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Hata: ssh çalıştırılamadı: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Başka süreç yaratılamıyor: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Vekil sunucu:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Güvenlik duvarı"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Vekil sunucu portu:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Güvenlik duvarında bağlanılacak port"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Vekil sunucu kullanıcı adı:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Güvenlik duvarı kullanıcı adı"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Vekil sunucu parolası:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Güvenlik duvarı parolası"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "HTTP/1.1 kullan"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "HTTP/1.1 ya da HTTP/1.0 kullanmak istiyor musunuz?"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -916,65 +916,65 @@ msgstr ""
 "Sunucudan hatalı bir yanıt alındı, bağlantı kesiliyor\n"
 "Uzaktaki sunucu tarafından geçersiz yığın boyutu '%s' döndürüldü\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: lib/rfc2068.c:255 lib/rfc959.c:679 lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "%s adresiyle bağlantı kesiliyor\n"
 
-#: ../lib/rfc2068.c:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Göreli konumdan dosya aktarımı başlatılıyor"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "%s dosyası alınamıyor\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Dizin listesi alınıyor...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Sunucudan beklenmeyen bir cevap geldi, bağlantı kapatılıyor\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE komutu"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "kullanıcı makina"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "kullanıcı makina:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "kullanıcı makina port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "kullanıcı makina NOAHT"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP Vekil Sunucu"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Özel"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -982,19 +982,19 @@ msgstr ""
 "Bu, uzaktaki bir FTP sunucusuna isimsiz olarak her giriş yaptığınızda "
 "kullanılacak olan paroladır"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Vekil sunucu hesabı:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Güvenlik duvarı hesabı (seçimlik)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Vekil sunucu türü:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1011,11 +1011,11 @@ msgstr ""
 "(makine), o (port) ya da a (hesap) olabilir. Örneğin, vekil sunucu "
 "kullanıcısını belirtmek için %%pu yazabilirsiniz."
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "PASV adresi gözardı et"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1027,11 +1027,11 @@ msgstr ""
 "yerine iç IP adresini veren yönlendiriciler (router) için buna sıkça ihtiyaç "
 "duyulur."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Pasif dosya transferi"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1047,11 +1047,11 @@ msgstr ""
 "etkin değilse, gFTP istemci tarafında bir kapı açacak ve uzak sunucu buna "
 "bağlanmaya çalışacak."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Sembolik Bağlantıları Bul (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1063,15 +1063,16 @@ msgstr ""
 "isteyeceğiniz tek durum, uzak FTP sunucusunun LIST komutu için -L seçeneğini "
 "desteklemiyor olmasıdır."
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Dosyaları ASCII kipinde aktar"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1081,336 +1082,327 @@ msgstr ""
 "aktarım yapıyorsanız, bunu kapatmanızda bir sakınca yoktur. Eğer ikili veri "
 "indiriyorsanız, bunu devre dışı bırakmak isteyebilirsiniz."
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Sunucudan hatalı '%c' yanıtı alındı.\n"
 
-#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Bir IPv4 yuvası (soketi) oluşturulamadı: %s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: lib/rfc959.c:745 lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "PASV cevabında IP adresi bulunamadı '%s'\n"
 
-#: ../lib/rfc959.c:775
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 "PASV yanıtında IP adresi gözardı yoksayılarak %d.%d.%d.%d:%d 'e "
 "bağlanılıyor\n"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Veri bağlantısı kurulamadı: %s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Soket adı alınamadı: %s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Porta erişim yapılamadı: %s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: lib/rfc959.c:828 lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Port %d dinlemedi: %s\n"
 
-#: ../lib/rfc959.c:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "IPv6 soket yaratılamadı: %s\n"
 
-#: ../lib/rfc959.c:895
+#: lib/rfc959.c:895
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Hata: IPv6 aracılığıyla bağlanmışız gibi görünmüyoruz. Bağlantı iptal "
 "ediliyor.\n"
 
-#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Geçersiz EPSV yanıtı '%s'\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Yerel yuva (soket) adresi alınamıyor: %s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Sunucudan gelen bağlantı kabul edilemedi: %s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "toplam"
 
-#: ../lib/rfc959.c:1586
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Uyarı: Liste %s ayrıştırılamadı\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:77
-#: ../lib/socket-connect-gethostbyname.c:64
+#: lib/socket-connect-getaddrinfo.c:77 lib/socket-connect-gethostbyname.c:64
 #, c-format
 msgid "Looking up %s\n"
 msgstr "%s makinası bulunuyor\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:82
-#: ../lib/socket-connect-gethostbyname.c:69
+#: lib/socket-connect-getaddrinfo.c:82 lib/socket-connect-gethostbyname.c:69
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "%s makinası bulunamadı: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:115
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Soket yaratılamadı: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: lib/socket-connect-getaddrinfo.c:121 lib/socket-connect-gethostbyname.c:134
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "%s deneniyor:%d\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:127
-#: ../lib/socket-connect-gethostbyname.c:141
+#: lib/socket-connect-getaddrinfo.c:127 lib/socket-connect-gethostbyname.c:141
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "%s makinasına bağlantı kurulamadı: %s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:152
-#: ../lib/socket-connect-gethostbyname.c:159
+#: lib/socket-connect-getaddrinfo.c:152 lib/socket-connect-gethostbyname.c:159
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "%s makinasına bağlantı kuruldu:%d\n"
 
-#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#: 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 hizmet adı aranamıyor. Lütfen hizmetler dosyanızı kontrol edin\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: lib/sockutils.c:190 lib/sockutils.c:268 lib/sshv2.c:435
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "%s bağlantısı zaman aşımına uğradı\n"
 
-#: ../lib/sockutils.c:338
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Soket yaratılamadı: %s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Soket yaratılamadı: %s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH Program Adı:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH programının yolu"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH Ek Parametreleri:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH programına aktarılacak ek parametreler"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH Kullanıcı Adı/Parolası Gerekli"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH bağlantıları için kullanıcı adı/parola iste"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Program çalıştırılıyor: %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "RSA anahtarının parolasını girin"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Anahtar için bir parola girin '"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Parola"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "parola"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(evet/hayır)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "PASSCODE Girin:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "SecurID  Parolasını Girin:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Hata: Yanlış bir parola girildi\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: Protokol Yüklenemesi\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: Protokol versiyonu %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: %s'i Aç\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Kapat\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Dizin Aç %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Dizini Oku\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d Dosyayı kaldır %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Dizin oluştur %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: %s dizinini kaldır\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: Gerçek yok %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: Dosya özellikleri\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: Durum %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Tamam"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Dosya ve dizin bulunamadı"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Erişim engellendi"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Hata"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Kötü mesaj"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Bağlantı yok"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Bağlantı koptu"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "İşlem desteklenmiyor"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Sunucudan bilinmeyen bir mesaj alındı"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Hata: Sunucudan gelen mesaj boyu (%d) çok büyük\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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 "Hata: Sunucudan gelen mesaj boyu (%d) çok büyük\n"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1418,41 +1410,41 @@ msgstr ""
 "Uzak sunucu ile SSH bağlantısı başlatılırken bir hata oluştu. Uzak sunucudan "
 "alınan hata mesajı:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s makinasına SSH bağlantısı kuruluyor\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "%s SSH sunucusuna başarıyla bağlantı kuruldu\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL Motoru"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Dağınım (Entropi) Dosyası:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL dağınım dosyası"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Dağınım Tohumu Uzunluğu:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL motorunu tohumlamada kullanılacak en fazla bayt sayısı"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "SSL Paylaşımcısını Doğrula"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1465,11 +1457,11 @@ msgstr ""
 "Konu = %s\n"
 "Hata %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Paylaşımcı sertifikası alınamıyor\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1478,45 +1470,45 @@ msgstr ""
 "HATA: SSL sertifikasındaki makine (%s) bağlanmış olduğumuz makine (%s) ile "
 "eşleşmiyor. Bağlantı iptal ediliyor.\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL kütüphanesi ilklendirilemiyor\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Öntanımlı SSL sertifikaları yüklenirken hata oluştu\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Şifre listesi ayarlama hatası (geçerli şifre yok)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Hata: SSL motoru ilklendirilmemiş\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "SSL bağlantısı kurulurken hata oluştu (BIO nesnesi)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "SSL bağlantısı kurulurken hata oluştu (SSL nesnesi)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Paylaşımcı sertifikasında hata: %s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "İşlem iptal edildi\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Yeniden bağlantı kurmak için %d saniye bekleniyor\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1526,7 +1518,7 @@ msgstr ""
 "bakınız. gFTP özgür yazılımdır ve belirli koşullar altında istediğiniz gibi "
 "dağıtabilirsiniz; ayrıntılar için COPYING dosyasına bakınız.\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 " \n"
@@ -1535,69 +1527,69 @@ msgstr ""
 "Arman Aksoy <armish linux-sevenler de>\n"
 "Muhammet Kara <muhammet k gmail com>"
 
-#: ../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
+#: 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 "Hata: Uzaktaki sisteme bağlantı yok\n"
 
-#: ../src/uicommon/gftpui.c:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "kullanım: chmod <kip> <dosya>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "kullanım: rename <eski> <yeni>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "kullanım: delete <dizin>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "kullanım: rmdir <dizin>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "kullanımı: site <site komutu>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "kullanım: mkdir <yeni dizin>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "kullanım: chdir <dizin>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Geçersiz argüman\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Dizin önbelleğini temizle\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "kullanımı: open"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "kullanımı: set [değişken = değer]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Hata: %s değeri uygun bir ayar değeri değil.\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Hata: %s değeri gFTP'nin metin tabanlı şekli için geçerli değil\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1605,287 +1597,287 @@ msgstr ""
 "Desteklenen komutlar:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "kullanımı: %s <dosyatürü>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "hakkında"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "gFTP bilgisini gösterir"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Geçerli dosya iletim modunu Ascii'ye çevirir (sadece FTP için)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "ikilik"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Geçerli dosya iletim modunu ikiliğe çevirir (sadece FTP için)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Uzaktaki çalışma dizinini değiştirir"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Uzaktaki dosyanın haklarını değiştirir"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "temizle"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Kullanılabilir özellikler: önbellek"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "kapat"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Bağlantıyı kapatır"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "sil"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Uzaktaki bir dosyayı siler"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Uzaktaki çalışma dizinini listeler"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Dosyaları indirir"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "yardım"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Yerel çalışma dizinini değiştirir"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Yerel bir dosyanın haklarını değiştirir"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Yerel bir dosyayı siler"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Yerel dizini listeler"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Yerel bir dizin oluşturur"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Geçerli yerel çalışma dizini gösterir"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Yerel bir dosyayı yeniden adlandırır"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Yerel bir dizini siler"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Uzakta bir dizin oluşturur"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Yerel dosyaları gönderir"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "aç"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Uzaktaki sisteme bağlantı oluşturur"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Geçerli uzaktaki çalışma dizinini gösterir"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "çık"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "gFTP'den çık"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "yeniden adlandır"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Uzaktaki bir dosyayı yeniden adlandırır"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Uzaktaki bir dizini siler"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Ayar dosyası değerlerini gösterir. Bir değeri set özellik=değer şeklinde "
 "değiştirebilirsiniz"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Siteye özel bir komut çalıştır"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Hata: Komut anlaşılamadı\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s başarıyla aktarıldı (%.2f Kb/s)\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "%s makinesi üzerindeki %s dosyası atlanıyor\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s makinesi üzerindeki aktarım durduruluyor\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s dosyası %s'den alınamadı\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1894,35 +1886,34 @@ msgstr ""
 "Aktarılamayan %d dosya veya dizin bulunuyor. Hangi öğelerin düzgün "
 "aktarılmadığını görmek için günlüğe bakınız."
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Herhangi bir işlem yapmadan önce dur düğmesine tıklayın\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Yer İmini Çalıştır"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Yer İmi Ekle: Yer imi için bir isim vermelisiniz\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "Yer İmi Ekle: %s yer imi eklenemedi, çünkü zaten var\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Yer İmi Ekle"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Yer İmi Ekle: Bir makina adı belirtmelisiniz\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1932,31 +1923,31 @@ msgstr ""
 "Maddeleri / karakteriyle alt menülerine ayırabilirsiniz.\n"
 "(Örnek: Linux sayfaları/GNU"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Parolayı hatırla"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "Yer imi için bir isim belirtmelisiniz."
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Yeni Dizin"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Açılacak olan dizinin adını girin"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "Yeni Öğe"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Oluşturulacak yeni öğenin adını girin"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1965,106 +1956,99 @@ msgstr ""
 "%s yer imini ve bütün alt öğelerini\n"
 "silmek istediğinizden emin misiniz?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Yer İmini Sil"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Yer imleri"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Girdiyi Düzenle"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Tanım:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Makina adı:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Port."
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Hedef Dizin:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Yerel Dizin:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Kullanıcı adı:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Hesap:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Anonim hesapla gir"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "  İptal   "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Dosya/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/Dosya/Yeni _Klasör..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/Dosya/Yeni _Öğe..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/Dosya/_Sil"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/Dosya/_Özellikler..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Dosya/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/Dosya/_Kapat"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Yer İmlerini Düzenle"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2072,91 +2056,90 @@ msgstr ""
 "Şimdi dosyanın özelliklerini değiştirebilirsiniz.\n"
 "Not: Bazı ftp sunucuları chmod komutunu desteklemez"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Özel"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Kullanıcı"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Okuma"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Yazma"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Çalıştırma"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Diğerleri"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "%ld dosya ve %ld dizini silmek istiyor musunuz?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Bu %ld dosyayı silmek istediğinizden emin misiniz?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Bu %ld dizini silmek istediğinizden emin misiniz?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Dosyaları/Dizinleri Sil"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Sil"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "Bağlan"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Alınan URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Sürükle-Bırak"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Çık"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2164,468 +2147,455 @@ msgstr ""
 "Halen dosyalar alınıyor.\n"
 "Çıkmak istiyor musunuz?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "Konumu Aç"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Bağlanmak için bir URL girin"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/Pencere _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/Pencere _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/_İkili"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/FTP/_Tercihler..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/Çı_k"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Yerel"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Yerel/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/Yerel/_Konumu Aç..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/Yerel/Bağlantıyı _Kes"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Yerel/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/Yerel/_Dosya Türünü Değiştir..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/Yerel/_Seçileni Göster"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/Yerel/_Tümünü Seç"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Yerel/Tüm Dosyaları Seç"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Yerel/Hiçbirini Seçme"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Yerel/Dizin Listesini Kaydet..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Yerel/SITE Komutunu Gönder..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/Yerel/_Dizin Değiştir"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/Yerel/_İzinler..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/Yerel/_Yeni Klasör..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/Yerel/Yeniden _Adlandır..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/Yerel/_Sil..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/Yerel/_Düzenle..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/Yerel/_Görünüm..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/Yerel/_Tazele"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Uzak"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Uzak/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/Uzak/_Konumu Aç..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/Uzak/Bağlantıyı _Kes"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Uzak/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/Uzak/Dosya Türünü _Değiştir..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/Uzak/Seçileni _Göster"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/Uzak/Tümünü _Seç"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Uzak/Tüm Dosyaları Seç"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Uzak/Hiçbirini Seçme"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Uzak/Dizin Listesini Kaydet..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Uzak/SITE Komutu Gönder..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/Uzak/Dizin _Değiştir"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/Uzak/_İzinler..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/Uzak/Ye_ni Klasör..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/Uzak/Yeniden Adla_ndır..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/Uzak/_Sil..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/Uzak/Düz_enle..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/Uzak/_Görünüm..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/Uzak/_Tazele"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Yer İmleri"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Yer İmleri/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Yer İmleri/Yer İmi _Ekle"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Yer İmleri/Yer İmlerini _Düzenle"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Yer İmleri/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/_Aktarım"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/Aktarım/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/Aktarım/_Başlat"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/Aktarım/D_urdur"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/Aktarım/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/Aktarım/Bu _Dosyayı Atla"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/Aktarım/Dosyayı _Kaldır"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/Aktarım/Dosyayı _Yukarı Taşı"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/Aktarım/Dosyayı _Aşağı Taşı"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/Aktarım/Dosyaları _Al"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/Aktarım/_Dosyaları Gönder (Put)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/G_ünlük"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/Günlük/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/Günlük/_Temizle"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/Günlük/_Görüntüle"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/Günlük/_Kaydet..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/_Araçlar"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Araçlar/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/Araçlar/Pencereleri _Karşılaştır"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/Araçlar/_Önbelleği Temizle"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Yardım"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Yardım/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/Yardım/_Hakkında"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "Makine: "
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Makine: "
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "Kullanıcı: "
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Kullanıcı: "
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Parola: "
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Komut: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Dosya adı"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Büyüklük"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Tarih"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Özellikler"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Süreç"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Hata: Bağlantı kurmak için bir makine adı vermelisiniz\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Tazele"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Kullanıcı Adını Girin"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Lütfen bu site için kullanıcı adınızı girin"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Lütfen bu site için parolanızı girin"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "İşlem iptal edildi...bir dizgi girmelisiniz\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Dizin Oluştur"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Oluşturulacak dizinin adını girin"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Yeniden İsimlendir"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "%s dosyasını hangi isme dönüştürmek istiyorsunuz?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Adres"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Uzaktaki sistemde çalıştırılacak komutu girin"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "SİTE'ye önekle"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: src/gtk/gtkui_transfer.c:60 src/gtk/transfer.c:473 src/gtk/transfer.c:541
+#: src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Atlandı"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
-#: ../src/gtk/transfer.c:545
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
-#: ../src/gtk/gtkui_transfer.c:341
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Devam et"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Atla"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "İşlem"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Dosyaları Aktar"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2633,71 +2603,71 @@ msgstr ""
 "Seçilen dosya çhem yerelde hemde uzakta bulunuyor.\n"
 "Lütfen ne yapmak istediğinizi seçin"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Hata"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Dosyayı Atla"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Tümünü Seç"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Hiçbirisini Seçme"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Dosya tipini değiştir: İşlem iptal edildi... Bir değer girmeniz gerekli\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Dosya Tipini Değiştir"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Yeni dosya tipini girin"
 
-#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Hata: %s yazılmak için açılamıyor: %s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Dizin Listesini Kaydet"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Hata: %s'e yazılamadı: %s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Kayıt %s dosyasına başarıyla yazıldı\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Günlüğü Kaydet"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "COPYING dosyası bulunamadı. %s ya da %s içinde bulunduğuna emin olun."
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "gFTP Hakkında"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2708,27 +2678,23 @@ msgstr ""
 "Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Resmi Ev Sayfası: http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Hakkında"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Lisans Sözleşmesi"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  Kapat  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Pencereleri Karşılaştır"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Uzak sunucuyla bağlantıyı kes"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2736,72 +2702,56 @@ msgstr ""
 "Makine girdisinde belirtilen siteye bağlan. Eğer makine girdisi boş ise URL "
 "girebileceğiniz bir iletişim penceresi açılacaktır."
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (Bellekten) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "%s dosyası açılırken hata: %s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Uzak makinaya bağlantı yapılmadı\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Bu özellik kullanılan protokol ile uyumsuzdur\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Sadece tek öğe seçmelisiniz\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: En az tek öğe seçmelisiniz\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Değiştir"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "Ekle"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "İptal"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  Evet  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  Hayır  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Dizin listesi alınıyor"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  Dur  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2810,109 +2760,89 @@ msgstr ""
 "%ld dizin ve\n"
 "%ld dosya alındı."
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP Hatası: %s dosyası %s ya da %s içinde bulunamadı\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Makinayı Düzenle"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Makina Ekle"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "Türü:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Türü:"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Etki Alanı"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "Ağ Adresi"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Ağ adresi:"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "Ağ Maskesi"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "Ağ _maskesi:"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Etki alanı:"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Ağ Maskesi"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Yerel Makineler"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "Düzenle"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "_Düzenle"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "Uygula"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Dosya isimleri alınıyor..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Dosyaları Al: Uzaktaki sisteme bağlantı yok\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Hata: %d'den alınan: %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "%d başarıyla alındı\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Hata: %d alt öğesi düzgün olarak sonlanmadı.\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Hata: %s dosyası hakkında bilgi alınamadı: %s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "%s değiştirilmedi\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2921,110 +2851,113 @@ msgstr ""
 "%s dosyası değişti.\n"
 "Göndermek ister misiniz?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Dosyayı Düzenle"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Tamamlandı"
 
-#: ../src/gtk/transfer.c:734
+#: src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "%3$.2fKB/s hızında %1$s / %2$s gönderildi, kalan tahmini süre %4$02d:%5$02d:"
 "%6$02d"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s/%s dosya alındı. Hız: %.2fKB/s, %02d:%02d:%02d süre kaldı"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s / %s gönderildi, aktarım tıkandı, kalan süre bilinmiyor"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s/%s dosya alındı, aktarım durakladı, bitiş süresi bilinmiyor"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Bilinmeyen bir yüzde tamamlandı. (Dosya %ld / %ld)"
 
-#: ../src/gtk/transfer.c:804
+#: src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% bitti, tahmini kalan süre %02d:%02d:%02d. (Dosya: %ld/%ld)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Dosya isimleri alınıyor...%s bayt"
 
-#: ../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
+#: 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 "Aktarılacak dosya seçilmedi\n"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Görüntüle"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "Düzenle"
+
+#: src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Görüntüle: %s bir dizindir ve görüntülenemez.\n"
 
-#: ../src/gtk/view_dialog.c:52
+#: src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Düzenle: %s bir dizindir. Düzenlenemez.\n"
 
-#: ../src/gtk/view_dialog.c:123
+#: src/gtk/view_dialog.c:123
 msgid "Edit: You must specify an editor in the options dialog\n"
 msgstr "Görüntüle: Seçenekler bölümünde bir düzenleyici belirtmelisiniz.\n"
 
-#: ../src/gtk/view_dialog.c:177
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Görüntüle: Başka süreç yaratılamıyor: %s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Çalışan program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s dosyası %s ile açılıyor\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "%s dosyası görüntüleniyor\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Görüntüle: %s dosyası açılamadı: %s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kontrol uçbirimi %s açılamıyor\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Kullanıcı adı [anonim]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -3035,6 +2968,42 @@ msgstr ""
 "(o) üzerine yaz, (r) devam et, (s) atla, (O) Tümünün Üzerine Yaz, (R) Tümüne "
 "Devam Et, (S) Tümünü Atla: (%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "  İptal   "
+
+#~ msgid "Host: "
+#~ msgstr "Makine: "
+
+#~ msgid "User: "
+#~ msgstr "Kullanıcı: "
+
+#~ msgid "  Close  "
+#~ msgstr "  Kapat  "
+
+#~ msgid "Add"
+#~ msgstr "Ekle"
+
+#~ msgid "Cancel"
+#~ msgstr "İptal"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Evet  "
+
+#~ msgid "  No  "
+#~ msgstr "  Hayır  "
+
+#~ msgid "Type:"
+#~ msgstr "Türü:"
+
+#~ msgid "Network Address"
+#~ msgstr "Ağ Adresi"
+
+#~ msgid "_Edit"
+#~ msgstr "_Düzenle"
+
+#~ msgid "Apply"
+#~ msgstr "Uygula"
+
 #, fuzzy
 #~ msgid "usage: gftp [[protocol://][user[:pass] ]site[:port][/directory]]\n"
 #~ msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 7f4d2c8..c5050c1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,91 +7,99 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-12 00:22+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2005-08-10 09:54--500\n"
 "Last-Translator: Maxim Dziumanenko <mvd mylinux ua>\n"
 "Language-Team: Ukrainian <uk li org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "Неправильне URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Помилка: неправильний рядок \"%s\" у файлі-покажчику кешу\n"
 
-#: ../lib/cache.c:137 ../lib/fsp.c:537 ../lib/local.c:477
+#: 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"
 
-#: ../lib/cache.c:161
+#: lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Помилка: не вдається створити тимчасовий файл: %s\n"
 
-#: ../lib/cache.c:183 ../lib/cache.c:232 ../lib/config_file.c:157
-#: ../lib/config_file.c:163 ../lib/local.c:102 ../lib/local.c:217
-#: ../lib/rfc2068.c:259 ../lib/sshv2.c:1128
+#: 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:272 lib/rfc2068.c:260 lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Помилка закриття файлового дескриптора: %s\n"
 
-#: ../lib/cache.c:250 ../lib/fsp.c:128 ../lib/fsp.c:208 ../lib/local.c:136
-#: ../lib/local.c:145 ../lib/local.c:192
+#: 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:3000
+#: lib/charset-conv.c:71
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+"Помилка перетворення рядка '%s' з набору символів %s на набір символів %s: "
+"%s\n"
+
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Помилка: не вдається відкрити локальний файл %s: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2707 ../lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Помилка: не вдається записати в сокет: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2631 ../lib/sshv2.c:364
-#: ../lib/sslcommon.c:439
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Помилка: не вдається зчитати з сокету: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Попередження: не вдається знайти головний файл закладок %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "Попередження gFTP: пропуск рядка %d у файлі закладок: %s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 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 "
@@ -101,7 +109,7 @@ msgstr ""
 "сервер проксі (якщо він доступний). Синтаксис: dont_use_proxy=.домен чи "
 "dont_use_proxy=мережа число/маска"
 
-#: ../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"
@@ -110,60 +118,61 @@ msgstr ""
 "програма відображення. Примітка: всі аргументи крім розширення файла є "
 "необов'язковими"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "Ви виконували make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "Помилка gFTP: неправильна назва файла журналу %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: lib/config_file.c:732
+#, fuzzy
 msgid ""
-"Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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-2003 Brian Masney "
 "<masneyb gftp org>. Увага! Всі коментарі внесені сюди буде перезаписано."
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -175,9 +184,10 @@ msgstr ""
 "підглядає за вашою спиною, коли ви редагуєте файл. Раніше усі паролі "
 "зберігались у текстовому вигляді."
 
-#: ../lib/config_file.c:845
+#: lib/config_file.c:845
+#, fuzzy
 msgid ""
-"Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb gftp "
+"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 ""
@@ -186,94 +196,95 @@ msgstr ""
 "файл буде переписано. Якщо запис містить зірочку (*) в коментарі, ви не "
 "зможете змінити його через gFTP"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:383 ../lib/protocols.c:455
-#: ../lib/protocols.c:526 ../lib/rfc2068.c:545 ../lib/rfc2068.c:546
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<невідомий>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:190
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Помилка: не вдається відвантажити файл %s\n"
 
-#: ../lib/fsp.c:200
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Помилка: не вдається записати у файлі %s: %s\n"
 
-#: ../lib/fsp.c:238
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Помилка: не вдається закрити файл: %s\n"
 
-#: ../lib/fsp.c:326
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "Пошкоджений список файлів від сервера FSP: %s\n"
 
-#: ../lib/fsp.c:338 ../lib/fsp.c:339 ../lib/protocols.c:1541
-#: ../lib/protocols.c:1542 ../lib/protocols.c:1583 ../lib/protocols.c:1584
-#: ../lib/protocols.c:1647 ../lib/protocols.c:1654 ../lib/protocols.c:1730
-#: ../lib/protocols.c:1731 ../lib/protocols.c:1767
+#: 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 "невідомий"
 
-#: ../lib/fsp.c:376
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Не вдається отримати вміст каталогу FSP %s: %s\n"
 
-#: ../lib/fsp.c:438
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Успішно змінено каталог на %s\n"
 
-#: ../lib/fsp.c:448
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Не вдається змінити каталог на %s\n"
 
-#: ../lib/fsp.c:473 ../lib/fsp.c:502 ../lib/local.c:424 ../lib/local.c:447
-#: ../src/gtk/transfer.c:260 ../src/gtk/view_dialog.c:328
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Успішно видалено %s\n"
 
-#: ../lib/fsp.c:479 ../lib/local.c:430
+#: 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:508 ../lib/local.c:453 ../src/gtk/transfer.c:264
-#: ../src/gtk/view_dialog.c:332
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Помилка: не вдається видалити файл %s: %s\n"
 
-#: ../lib/fsp.c:530 ../lib/local.c:470
+#: lib/fsp.c:528 lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Успішно створено каталог %s\n"
 
-#: ../lib/fsp.c:565 ../lib/local.c:496
+#: lib/fsp.c:563 lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "Успішно перейменовано %s на %s\n"
 
-#: ../lib/fsp.c:577 ../lib/local.c:503
+#: 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"
@@ -281,7 +292,7 @@ msgstr ""
 "Підтримка FTPS недоступна, бо програма скомпільована без SSL. З'єднання "
 "перервано.\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
@@ -289,100 +300,105 @@ msgstr ""
 "Підтримка HTTPS недоступна, бо програма скомпільована без SSL. З'єднання "
 "перервано.\n"
 
-#: ../lib/local.c:71 ../lib/local.c:407
-#, c-format
-msgid "Could not change local directory to %s: %s\n"
-msgstr "Не вдається змінити локальний каталог у %s: %s\n"
-
-#: ../lib/local.c:85 ../lib/local.c:392
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "Не вдається отримати поточний робочий каталог: %s\n"
 
-#: ../lib/local.c:183
+#: lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Успішно змінено локальний каталог на %s\n"
+
+#: lib/local.c:112
+#, c-format
+msgid "Could not change local directory to %s: %s\n"
+msgstr "Не вдається змінити локальний каталог у %s: %s\n"
+
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Помилка: не вдається обрізати локальний файл %s: %s\n"
 
-#: ../lib/local.c:347
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Не вдається отримати вміст локального каталогу %s: %s\n"
 
-#: ../lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Успішно змінено локальний каталог на %s\n"
-
-#: ../lib/local.c:520
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Успішно змінено права доступу %s на %o\n"
 
-#: ../lib/local.c:527
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Помилка: не вдається змінити права доступу %s на %o: %s\n"
 
-#: ../lib/local.c:623
+#: lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Успішно змінено каталог на %s\n"
+
+#: lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Помилка: не вдається змінити права доступу %s на %o: %s\n"
+
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "локальна файлова система"
 
-#: ../lib/misc.c:401
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "використання: gftp "
 
-#: ../lib/misc.c:401 ../lib/rfc2068.c:303 ../src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../lib/options.h:24 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "немає"
 
-#: ../lib/options.h:24
+#: lib/options.h:25
 msgid "file"
 msgstr "файл"
 
-#: ../lib/options.h:24
+#: lib/options.h:26
 msgid "size"
 msgstr "розмір"
 
-#: ../lib/options.h:25
+#: lib/options.h:26
 msgid "user"
 msgstr "Користувач"
 
-#: ../lib/options.h:25
+#: lib/options.h:27
 msgid "group"
 msgstr "Група"
 
-#: ../lib/options.h:26
+#: lib/options.h:28
 msgid "datetime"
 msgstr "дата"
 
-#: ../lib/options.h:26
+#: lib/options.h:29
 msgid "attribs"
 msgstr "ознаки"
 
-#: ../lib/options.h:28
+#: lib/options.h:32
 msgid "descending"
 msgstr "спадаючий"
 
-#: ../lib/options.h:28
+#: lib/options.h:33
 msgid "ascending"
 msgstr "зростаючий"
 
-#: ../lib/options.h:34
+#: lib/options.h:40
 msgid "General"
 msgstr "Загальне"
 
-#: ../lib/options.h:37
+#: lib/options.h:43
 msgid "View program:"
 msgstr "Програма відображення:"
 
-#: ../lib/options.h:38
+#: lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
@@ -390,36 +406,28 @@ msgstr ""
 "Звичайна програма для показу файлів. Якщо це поле порожнє, то "
 "використовуватиметься внутрішній переглядач."
 
-#: ../lib/options.h:40
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "Програма редагування:"
 
-#: ../lib/options.h:41
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "Звичайна програма для редагування файлів."
 
-#: ../lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Початковий каталог:"
-
-#: ../lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Каталог, в який gFTP переходитиме під час запуску"
-
-#: ../lib/options.h:45
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "Максимальний розмір вікна журналу:"
 
-#: ../lib/options.h:47
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr ""
 "Максимальний розмір вікна журналу в байтах для версії, що використовує GTK+"
 
-#: ../lib/options.h:49
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Віддалений набір символів:"
 
-#: ../lib/options.h:51
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
@@ -427,11 +435,11 @@ msgstr ""
 "Це список розділених комою наборів символів, для спроб перетворення "
 "віддалених повідомлень у поточну локаль"
 
-#: ../lib/options.h:53
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Віддалене LC_TIME:"
 
-#: ../lib/options.h:55
+#: lib/options.h:58
 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."
@@ -439,171 +447,194 @@ msgstr ""
 "Це значення LC_TIME  для віддаленого сайту. Це не Таким чином дати можуть "
 "бути правильно розібрані у списках файлів каталогів."
 
-#: ../lib/options.h:57
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "Кеш TTL:"
 
-#: ../lib/options.h:60
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Кількість секунд для зберігання кешу перш ніж він застаріє."
 
-#: ../lib/options.h:63
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "Додавати файли для передачі"
 
-#: ../lib/options.h:65
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Додавати новий файл для передачі"
 
-#: ../lib/options.h:66
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "Робити одночасно лише одну передачу"
 
-#: ../lib/options.h:68
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "Робити одночасно лише одну передачу?"
 
-#: ../lib/options.h:69
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Звичайно перезаписувати"
 
-#: ../lib/options.h:72
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Звичайно перезаписувати файли чи продовжувати передачу"
 
-#: ../lib/options.h:74
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Зберігати права доступу до файлів"
 
-#: ../lib/options.h:77
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "Зберігати права доступу до переданих файлів"
 
-#: ../lib/options.h:79
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "Зберігати час файлів"
 
-#: ../lib/options.h:82
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "Зберігати час файлів переданих файлів"
 
-#: ../lib/options.h:84
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Оновлювати після кожної передачі"
 
-#: ../lib/options.h:87
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "Оновлювати список файлів після кожної передачі"
 
-#: ../lib/options.h:89
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "Каталоги перед файлами"
 
-#: ../lib/options.h:92
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Розміщати каталоги перед файлами"
 
-#: ../lib/options.h:93
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "Показувати приховані файли"
 
-#: ../lib/options.h:96
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Показувати приховані файли в списках"
 
-#: ../lib/options.h:97
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "Показувати статус передачі у заголовку"
 
-#: ../lib/options.h:99
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "Показувати статус передачі файлів у заголовку"
 
-#: ../lib/options.h:100
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "Розпочинати передачу"
 
-#: ../lib/options.h:102
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Автоматично розпочинати передачу файлів, після потрапляння в чергу"
 
-#: ../lib/options.h:104
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Дозволити ручні команди у графічному інтерфейсі"
 
-#: ../lib/options.h:106
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 "Дозволити ввід ручних команд в графічному інтерфейсі (функції подібні до "
 "текстової версії)"
 
-#: ../lib/options.h:108 ../src/gtk/options_dialog.c:1023
-#: ../src/gtk/options_dialog.c:1243
+#: lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Видалити локальний каталог"
+
+#: lib/options.h:113
+msgid "Save the last local and remote directory when the application is closed"
+msgstr ""
+
+#: lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Закрити з'єднання з віддаленим сервером"
+
+#: lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "Мережа"
 
-#: ../lib/options.h:110
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "Час очікування мережі:"
 
-#: ../lib/options.h:113
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr ""
 "Час очікування при мережному вводі-виводі. Це не затримка під час простою."
 
-#: ../lib/options.h:115
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "Спроб з'єднання:"
 
-#: ../lib/options.h:118
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr ""
 "Кількість автоматичних спроб з'єднання. Встановлення в 0, робить кількість "
 "повторів нескінченною"
 
-#: ../lib/options.h:120
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Затримка між спробами:"
 
-#: ../lib/options.h:123
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Кількість секунд в затримці між спробами"
 
-#: ../lib/options.h:124
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Обмеження швидкості, кб/с:"
 
-#: ../lib/options.h:127
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Обмеження швидкості передачі в кб/с (встановіть в 0 для вимкнення)."
 
-#: ../lib/options.h:129
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "Розбір блоку передачі:"
 
-#: ../lib/options.h:132
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr ""
 "Розмір блоку, який використовується для передавання файлів. Повинен бути "
 "кратним 1024."
 
-#: ../lib/options.h:135
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Звичайний протокол:"
 
-#: ../lib/options.h:137
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Це визначає звичайний протокол передачі"
 
-#: ../lib/options.h:139 ../lib/options.h:142
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Увімкнути протокол IPv6"
 
-#: ../lib/options.h:147
+#: lib/options.h:159
 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"
@@ -611,27 +642,27 @@ msgstr ""
 "Визначає, що буде в разі подвійного клацання на файлі у вікні списку файлів. "
 "0 — перегляд файла, 1 — редагування файла, 2 — передача файла"
 
-#: ../lib/options.h:150
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Звичайна ширина списку локальних файлів"
 
-#: ../lib/options.h:153
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Звичайна ширина списку віддалених файлів"
 
-#: ../lib/options.h:156
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "Звичайна висота списку локальних/віддалених файлів"
 
-#: ../lib/options.h:159
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "Звичайна висота списку передачі"
 
-#: ../lib/options.h:162
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "Звичайна висота вікна журналу"
 
-#: ../lib/options.h:165
+#: 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."
@@ -639,15 +670,15 @@ msgstr ""
 "Ширина стовпчика назви файла у вікні передачі.  Встановіть 0, щоб цей "
 "стовпчик автоматично змінював свою ширину."
 
-#: ../lib/options.h:173 ../lib/options.h:179
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Стовпчик, за яким відбувається початкове сортування"
 
-#: ../lib/options.h:176 ../lib/options.h:182
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Сортувати за зростанням чи спаданням"
 
-#: ../lib/options.h:186 ../lib/options.h:204
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -656,7 +687,7 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:189 ../lib/options.h:207
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -665,7 +696,7 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:192 ../lib/options.h:210
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -674,7 +705,7 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:195 ../lib/options.h:213
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -683,7 +714,7 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:198 ../lib/options.h:216
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -692,7 +723,7 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:201 ../lib/options.h:219
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -701,98 +732,75 @@ msgstr ""
 "стовпчик автоматично змінював свій розмір. Встановіть у -1, щоб вимкнути цей "
 "стовпчик."
 
-#: ../lib/options.h:222
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Колір відісланих до сервера команд"
 
-#: ../lib/options.h:225
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Колір отриманих від сервера команд"
 
-#: ../lib/options.h:228
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Колір повідомлень про помилки"
 
-#: ../lib/options.h:231
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Колір інших повідомлень"
 
-#: ../lib/options.h:237 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:240 ../lib/options.h:242
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:245 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:248 ../lib/options.h:250
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:253
+#: lib/options.h:270
 msgid "Local"
 msgstr "Локальні"
 
-#: ../lib/options.h:255
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:257 ../src/gtk/bookmarks.c:886
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "Закладки"
 
-#: ../lib/options.h:258
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "Передачу файлів буде обмежено до швидкості %.2f кб/с\n"
 
-#: ../lib/protocols.c:379
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Помилка встановлення LC_TIME у '%s'. Встановлюється значення '%s'\n"
 
-#: ../lib/protocols.c:390
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Завантаження вмісту каталогу %s з кешу (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:400
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Завантаження вмісту каталогу %s з сервера (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:454 ../lib/protocols.c:486 ../lib/protocols.c:525
-#: ../lib/protocols.c:557
-#, c-format
-msgid ""
-"Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-"Помилка перетворення рядка '%s' з набору символів %s на набір символів %s: %"
-"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:469
-#, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
-msgstr "Помилка перетворення рядка '%s' у UTF-8 з поточної локалі: %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:540
-#, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr "Помилка перетворення рядка '%s' у поточну локаль з UTF-8: %s\n"
-
-#: ../lib/protocols.c:629
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -801,164 +809,112 @@ msgstr ""
 "Попередження: відрізається шлях від файлу '%s'. Відрізаний шлях (%s) не "
 "відповідає поточному каталогу (%s)\n"
 
-#: ../lib/protocols.c:647
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Помилка: не вдається записати у кеш: %s\n"
 
-#: ../lib/protocols.c:680
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Помилка: не вдається знайти закладку %s\n"
 
-#: ../lib/protocols.c:687
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Помилка закладок: запис %s не містить назви машини\n"
 
-#: ../lib/protocols.c:826 ../lib/protocols.c:853
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Протокол '%s' наразі не підтримується.\n"
 
-#: ../lib/protocols.c:1167 ../lib/protocols.c:1182 ../lib/protocols.c:2214
-#: ../lib/protocols.c:2324
-#, c-format
-msgid "Looking up %s\n"
-msgstr "Пошук %s\n"
-
-#: ../lib/protocols.c:1173 ../lib/protocols.c:1188 ../lib/protocols.c:2219
-#: ../lib/protocols.c:2329
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Не вдається знайти машину %s: %s\n"
-
-#: ../lib/protocols.c:2237
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Не вдається створити сокет: %s\n"
-
-#: ../lib/protocols.c:2243 ../lib/protocols.c:2346
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "Спроба %s:%d\n"
-
-#: ../lib/protocols.c:2248 ../lib/protocols.c:2353
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Не вдається встановити з'єднання з %s: %s\n"
-
-#: ../lib/protocols.c:2283 ../lib/rfc959.c:640
+#: lib/protocols.c:1153
 #, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Не вдається створити сокет IPv4: %s\n"
-
-#: ../lib/protocols.c:2307 ../lib/sshv2.c:1046
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "Не вдається знайти назву служби %s/tcp. Перевірте файл services\n"
-
-#: ../lib/protocols.c:2369 ../lib/protocols.c:3009 ../lib/rfc959.c:649
-#: ../lib/rfc959.c:826
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "Помилка: не вдається закрити ознаку exec: %s\n"
-
-#: ../lib/protocols.c:2376
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Встановлено з'єднання з %s:%d\n"
-
-#: ../lib/protocols.c:2607 ../lib/protocols.c:2682 ../lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Затримка з'єднання з %s\n"
-
-#: ../lib/protocols.c:2750
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Не вдається отримати ознаки сокету: %s\n"
-
-#: ../lib/protocols.c:2764
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Не вдається встановити сокет у безблокувальний режим: %s\n"
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
 
-#: ../lib/protocols.c:2899
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr ""
 "Помилка: закрито з'єднання з віддаленим сервером %s. Досягнуто максимальної "
 "кількості спроб.\n"
 
-#: ../lib/protocols.c:2907
+#: lib/protocols.c:1539
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr ""
 "Помилка: розірвано з'єднання з сервером %s. Спробу відновити з'єднання буде "
 "здійснено за %d секунд\n"
 
-#: ../lib/pty.c:297
+#: lib/protocols.c:1634 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"
 msgstr "Не вдається отримати основний псевдотермінал %s: %s\n"
 
-#: ../lib/pty.c:305
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Не вдається створити пару сокетів: %s\n"
 
-#: ../lib/pty.c:334
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Помилка: не вдається виконати ssh: %s\n"
 
-#: ../lib/pty.c:350
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Не вдається створити дочірній процес: %s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Машина проксі:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Машина брандмауера"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Порт проксі:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Порт з'єднання на брандмауері"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Користувач проксі:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Ваша облікова назва на брандмауері"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Пароль проксі:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ваш пароль на брандмауері"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "Використовувати HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Ви хочете використовувати HTTP/1.1 чи HTTP/1.0"
 
-#: ../lib/rfc2068.c:150 ../lib/rfc2068.c:843
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -967,65 +923,65 @@ msgstr ""
 "Отримано неправильну відповідь від сервера, закриття з'єднання\n"
 "Сервер повернув неправильний розмір сегменту '%s'\n"
 
-#: ../lib/rfc2068.c:254 ../lib/rfc959.c:608 ../lib/sshv2.c:1123
+#: 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:303
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "Початок передачі файла з позиції "
 
-#: ../lib/rfc2068.c:324
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Не вдається отримати файл %s\n"
 
-#: ../lib/rfc2068.c:423 ../lib/sshv2.c:1205
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Отримання вмісту каталогу...\n"
 
-#: ../lib/rfc2068.c:819 ../lib/sshv2.c:814
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Отримано неправильну відповідь від сервера, закриття з'єднання\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "Команда SITE"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "користувач машина"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "користувач машина:порт"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "АВТЕНТИФІКУВАТИ"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "користувач машина порт"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "користувач машина NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "Проксі HTTP"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "Інше"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
@@ -1033,19 +989,19 @@ msgstr ""
 "Це пароль, який буде використовуватись при вході на віддалений FTP як "
 "anonymous"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "Обліковий запис на проксі:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "Ваш обліковий запис на брандмауері (необов'язково)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "Тип сервера проксі:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -1061,11 +1017,11 @@ msgstr ""
 "може бути u (користувач), p (пароль), h (вузол), o (порт) чи a (обліковий "
 "запис). Наприклад, щоб вказати користувача проксі,можна ввести %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "Ігнорувати адресу PASV"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -1077,11 +1033,11 @@ msgstr ""
 "потрібно для для маршрутизаторів, які у відповіді PASV дають їх внутрішню на "
 "відміну від зовнішньої адреси IP ."
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Пасивна передача файлів"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1096,11 +1052,11 @@ msgstr ""
 "вимкнено, gFTP відкриє порт зі сторони клієнта та віддалений сервер спробує "
 "до нього підключитись."
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Розв'язувати віддалені символьні посилання (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1111,15 +1067,16 @@ msgstr ""
 "списку каталогів. Загалом, це правильно. Єдиний випадок коди вас слід "
 "вимкнути цю функцію,  якщо сервер FTP не підтримує параметр -L команди LIST"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Передати файли у режимі ASCII"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1128,273 +1085,324 @@ msgstr ""
 "файлів. Якщо ви передаєте файли з UNIX до UNIX, тоді можна її вимкнути.  "
 "Якщо ви завантажуєте двійкові файли, слід вимкнути цю функцію."
 
-#: ../lib/rfc959.c:322 ../lib/rfc959.c:331 ../lib/rfc959.c:342
-#: ../lib/rfc959.c:789 ../lib/rfc959.c:1387
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 lib/rfc959.c:849
+#: lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Неправильна відповідь '%c' від сервера.\n"
 
-#: ../lib/rfc959.c:679 ../lib/rfc959.c:689
+#: 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 "Не вдається знайти IP-адресу у відповіді на команду PASV \"%s\"\n"
 
-#: ../lib/rfc959.c:715
+#: lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
-"Ігнорується IP-адресу у відповіді на команду PASV, з'єднання з %d.%d.%d.%d:%"
-"d\n"
+"Ігнорується IP-адресу у відповіді на команду PASV, з'єднання з %d.%d.%d.%d:"
+"%d\n"
 
-#: ../lib/rfc959.c:726 ../lib/rfc959.c:887
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Не вдається створити з'єднання для передачі даних: %s\n"
 
-#: ../lib/rfc959.c:738 ../lib/rfc959.c:759 ../lib/rfc959.c:912
+#: 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:749 ../lib/rfc959.c:902
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Не вдається прив'язатися до порта: %s\n"
 
-#: ../lib/rfc959.c:768 ../lib/rfc959.c:921
+#: 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:817
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Не вдається створити сокет IPv6: %s\n"
 
-#: ../lib/rfc959.c:837
+#: 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:865 ../lib/rfc959.c:874
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Неправильна відповідь EPSV '%s'\n"
 
-#: ../lib/rfc959.c:931
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Не вдається отримати адресу локального сокету: %s\n"
 
-#: ../lib/rfc959.c:1005
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Не вдається прийняти з'єднання з сервера: %s\n"
 
-#: ../lib/rfc959.c:1542
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "всього"
 
-#: ../lib/rfc959.c:1544
+#: lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Увага: не вдається проаналізувати список %s\n"
 
-#: ../lib/sshv2.c:28
+#: 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. Перевірте файл services\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
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "Назва програми SSH:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "Шлях до програми SSH"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "Додаткові параметри для SSH:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "Додаткові параметри для передачі програмі SSH"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "SSH вимагає назву користувача і пароль"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "Запитувати назву користувача і пароль для з'єднань через SSH"
 
-#: ../lib/sshv2.c:298
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Запуск програми %s\n"
 
-#: ../lib/sshv2.c:307
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Введіть пароль до ключа RSA"
 
-#: ../lib/sshv2.c:308
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Введіть пароль для ключа '"
 
-#: ../lib/sshv2.c:309
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "Пароль"
 
-#: ../lib/sshv2.c:310
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "пароль"
 
-#: ../lib/sshv2.c:414
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:432
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Введіть PASSCODE:"
 
-#: ../lib/sshv2.c:436 ../src/gtk/gtkui.c:118 ../src/gtk/transfer.c:554
-#: ../src/gtk/transfer.c:564
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Введіть пароль"
 
-#: ../lib/sshv2.c:437
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Введіть пароль SecurID:"
 
-#: ../lib/sshv2.c:487
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Помилка: введено неправильний пароль\n"
 
-#: ../lib/sshv2.c:516
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d: ініціалізація протоколу\n"
 
-#: ../lib/sshv2.c:520
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d: протокол версії %d\n"
 
-#: ../lib/sshv2.c:529
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d: відкрити %s\n"
 
-#: ../lib/sshv2.c:534
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: закрити\n"
 
-#: ../lib/sshv2.c:537
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: відкрити каталог %s\n"
 
-#: ../lib/sshv2.c:542
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: зчитати каталог\n"
 
-#: ../lib/sshv2.c:546
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: видалити файл %s\n"
 
-#: ../lib/sshv2.c:551
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: створити каталог %s\n"
 
-#: ../lib/sshv2.c:556
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: видалити каталог %s\n"
 
-#: ../lib/sshv2.c:561
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d: справжній шлях %s\n"
 
-#: ../lib/sshv2.c:566
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d: ознаки файла\n"
 
-#: ../lib/sshv2.c:570
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d: стан %s\n"
 
-#: ../lib/sshv2.c:590
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d: змінити права %s %o\n"
 
-#: ../lib/sshv2.c:595
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d: змінити час доступу %s %d\n"
 
-#: ../lib/sshv2.c:609 ../src/gtk/bookmarks.c:1045 ../src/gtk/bookmarks.c:1298
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:368
-#: ../src/gtk/misc-gtk.c:1011 ../src/gtk/options_dialog.c:1208
-#: ../src/gtk/options_dialog.c:1442
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "Гаразд"
 
-#: ../lib/sshv2.c:612
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "Завершення файла"
 
-#: ../lib/sshv2.c:615
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Немає такого файла чи каталогу"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "Недостатньо прав доступу"
 
-#: ../lib/sshv2.c:621
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "Збій"
 
-#: ../lib/sshv2.c:624
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Неправильне повідомлення"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "Немає з'єднання"
 
-#: ../lib/sshv2.c:630
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Втрачено з'єднання"
 
-#: ../lib/sshv2.c:633
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Операція не підтримується"
 
-#: ../lib/sshv2.c:636
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Від сервера отримано невідому відповідь"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Помилка: розмір повідомлення надто великий — %d\n"
 
-#: ../lib/sshv2.c:730 ../lib/sshv2.c:1225 ../lib/sshv2.c:1821
-#: ../lib/sshv2.c:1959
+#: 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"
 
-#: ../lib/sshv2.c:736
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1402,41 +1410,41 @@ msgstr ""
 "Помилка ініціалізації з'єднання SSH з віддаленим сервером. Повідомлення про "
 "помилку з віддаленого сервера:\n"
 
-#: ../lib/sshv2.c:1038
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Встановлення з'єднання SSH з %s\n"
 
-#: ../lib/sshv2.c:1090
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Успішно зареєстровано на сервері SSH %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "Механізм SSL"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "Файл ентропії SSL:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "Файл ентропії SSL"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Початкове значення ентропії:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "Максимальна кількість байтів для швидкості механізму SSL"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "Перевірка SSL адресата"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1449,11 +1457,11 @@ msgstr ""
 "Тема = %s\n"
 "Помилка %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "Не вдається отримати сертифікат адресата\n"
 
-#: ../lib/sslcommon.c:188
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1462,55 +1470,45 @@ msgstr ""
 "ПОМИЛКА: вузол у сертифікаті SSL (%s) не відповідає вузлу до якого "
 "встановлюється з'єднання (%s). З'єднання розривається.\n"
 
-#: ../lib/sslcommon.c:295
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "Не вдається ініціалізувати бібліотеку OpenSSL\n"
 
-#: ../lib/sslcommon.c:310
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "Помилка завантаження типових сертифікатів SSL\n"
 
-#: ../lib/sslcommon.c:322
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "Помилка встановлення списку шифру (немає правильних шифрів)\n"
 
-#: ../lib/sslcommon.c:342 ../lib/sslcommon.c:416 ../lib/sslcommon.c:464
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "Помилка: механізм SSL не було ініціалізовано\n"
 
-#: ../lib/sslcommon.c:359
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "Помилка встановлення з'єднання SSL (об'єкт BIO)\n"
 
-#: ../lib/sslcommon.c:369
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "Помилка встановлення з'єднання SSL (об'єкт SSL)\n"
 
-#: ../lib/sslcommon.c:390
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Помилка сертифіката адресата: %s\n"
 
-#: ../src/uicommon/gftpui.c:91
-#, c-format
-msgid "Waiting %d seconds until trying to connect again\n"
-msgstr "Очікування %d секунд перед наступною спробою встановити з'єднання\n"
-
-#: ../src/uicommon/gftpui.c:101
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "Операцію скасовано\n"
 
-#: ../src/uicommon/gftpui.c:190
-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 ""
-">. Якщо у вас є запитання, коментарі чи зауваження щодо цієї програми, ви "
-"можете написати мені про це електронною поштою. Ви можете також знайти "
-"останні новини про gFTP на моєму сайті за адресою http://www.gftp.org/\n";
+#: src/uicommon/gftpui.c:65
+#, c-format
+msgid "Waiting %d seconds until trying to connect again\n"
+msgstr "Очікування %d секунд перед наступною спробою встановити з'єднання\n"
 
-#: ../src/uicommon/gftpui.c:191
+#: 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 "
@@ -1520,75 +1518,75 @@ msgstr ""
 "зверніться до файлу COPYING. Це вільне програмне забезпечення, ви можете "
 "розповсюджувати його на умовах, описаних у файлі COPYING\n"
 
-#: ../src/uicommon/gftpui.c:193 ../src/gtk/menu-items.c:505
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "Переклад здійснив Юрій Сирота <yuriy beer com> та Максим Дзюманенко "
 "<mvd mylinux ua>"
 
-#: ../src/uicommon/gftpui.c:240 ../src/uicommon/gftpui.c:282
-#: ../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:872
+#: 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:251
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "використання: chmod <режим> <файл>\n"
 
-#: ../src/uicommon/gftpui.c:292
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "використання: rename <стара назва> <нова назва>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "використання: delete <файл>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "використання: rmdir <каталог>\n"
 
-#: ../src/uicommon/gftpui.c:398
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "використання: site <команда>\n"
 
-#: ../src/uicommon/gftpui.c:433
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "використання: mkdir <новий каталог>\n"
 
-#: ../src/uicommon/gftpui.c:469 ../src/uicommon/gftpui.c:487
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "використання: chdir <каталог>\n"
 
-#: ../src/uicommon/gftpui.c:560
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "Неправильний аргумент\n"
 
-#: ../src/uicommon/gftpui.c:573
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "Очистити кеш каталогів\n"
 
-#: ../src/uicommon/gftpui.c:662
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "використання: open "
 
-#: ../src/uicommon/gftpui.c:733
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "використання: set [змінна = значення]\n"
 
-#: ../src/uicommon/gftpui.c:747
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Помилка: змінна %s не є конфігураційною змінною.\n"
 
-#: ../src/uicommon/gftpui.c:754
+#: 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:836
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1596,317 +1594,322 @@ msgstr ""
 "Підтримуванні команди:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:879
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "використання: %s <визначення файлів>\n"
 
-#: ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Показати інформацію про gFTP"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Встановити поточний режим передачі файлів текстовим (лише для FTP)"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Встановити поточний режим передачі файлів двійковим (лише для FTP)"
 
-#: ../src/uicommon/gftpui.c:970
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:971 ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Змінити віддалений робочий каталог"
 
-#: ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "Змінити права доступу до віддаленого файла"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "Доступні параметри: cache"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Закрити з'єднання з віддаленим сервером"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Видалити віддалений файл"
 
-#: ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "Зміст каталогу"
 
-#: ../src/uicommon/gftpui.c:983 ../src/uicommon/gftpui.c:1009
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Показати вміст поточного віддаленого каталогу"
 
-#: ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:985 ../src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Звантажити віддалені файли"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Показати цю довідку"
 
-#: ../src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:989 ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Змінити локальний робочий каталог"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "Змінити права доступу до локального файлу"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Видалити локальний файл"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:997 ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Показати вміст поточного локального каталогу"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Створити локальний каталог"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:1003
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Показати поточний локальний каталог"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Перейменувати локальний файл"
 
-#: ../src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:1007
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Видалити локальний каталог"
 
-#: ../src/uicommon/gftpui.c:1008
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:1010
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Створити віддалений каталог"
 
-#: ../src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:1015 ../src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Відвантажити локальні файли"
 
-#: ../src/uicommon/gftpui.c:1016
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:1017
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Відкрити з'єднання з віддаленим сервером"
 
-#: ../src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Показати поточний віддалений каталог"
 
-#: ../src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Вийти з gFTP"
 
-#: ../src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:1025
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Перейменувати віддалений файл"
 
-#: ../src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Видалити каталог"
 
-#: ../src/uicommon/gftpui.c:1028
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1029
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Показати змінні в конфігураційному файлі. Ви також можете встановлювати "
 "змінні за допомогою set змінна=значення"
 
-#: ../src/uicommon/gftpui.c:1031
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "сайт"
 
-#: ../src/uicommon/gftpui.c:1032
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "Виконати специфічну для сервера команду"
 
-#: ../src/uicommon/gftpui.c:1122
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Помилка: команду не розпізнано\n"
 
-#: ../src/uicommon/gftpui.c:1375
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr ""
-"Помилка: розірвано з'єднання з віддаленим сервером після спроби передати "
-"файл\n"
+#: src/uicommon/gftpui.c:1304
+#, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "Успішно передано %s на швидкості %.2f кб/с\n"
 
-#: ../src/uicommon/gftpui.c:1443
+#: src/uicommon/gftpui.c:1335
 #, c-format
-msgid "Could not download %s from %s\n"
-msgstr "Не вдається звантажити %s з %s\n"
+msgid "Skipping file %s on host %s\n"
+msgstr "Пропуск файла %s на сервері %s\n"
 
-#: ../src/uicommon/gftpui.c:1467
+#: src/uicommon/gftpui.c:1359
 #, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "Успішно передано %s на швидкості %.2f кб/с\n"
+msgid "Stopping the transfer on host %s\n"
+msgstr "Припинення передачі з сервером %s\n"
+
+#: src/uicommon/gftpui.c:1505
+#, c-format
+msgid "Could not download %s from %s\n"
+msgstr "Не вдається звантажити %s з %s\n"
 
-#: ../src/uicommon/gftpui.c:1474
+#: src/uicommon/gftpui.c:1561
 #, c-format
-msgid "There was an error transfering the file %s"
-msgstr "Помилка передавання файлу %s"
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:213
-#: ../src/gtk/gftp-gtk.c:1063 ../src/gtk/misc-gtk.c:512
-#: ../src/gtk/misc-gtk.c:520
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: натисніть кнопку \"Стоп\", перш ніж як зробити щось ще\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "Запуск закладки"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "Додавання закладки: необхідно ввести назву закладки\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr ""
 "Додавання закладки: не вдається додати закладку %s, бо така назва вже існує\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Додавання закладки"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "Додавання закладки: необхідно ввести назву машини\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1917,135 +1920,139 @@ msgstr ""
 "вкладене меню\n"
 "(наприклад, Сайти про Linux/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "Запам'ятати пароль"
 
-#: ../src/gtk/bookmarks.c:473 ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:418
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Додавання закладки: необхідно ввести назву закладки\n"
+
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "Нова тека"
 
-#: ../src/gtk/bookmarks.c:474
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "Введіть назву нової теки"
 
-#: ../src/gtk/bookmarks.c:484
+#: src/gtk/bookmarks.c:473
+#, fuzzy
+msgid "New Item"
+msgstr "/Файл/Новий елемент..."
+
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "Введіть назву нового елемента"
 
-#: ../src/gtk/bookmarks.c:557
-#, c-format
+#: src/gtk/bookmarks.c:547
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Ви впевнені, що бажаєте видалити закладку\n"
 "\"%s\" і всі елементи в ній?"
 
-#: ../src/gtk/bookmarks.c:558
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "Видалити закладку"
 
-#: ../src/gtk/bookmarks.c:630
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../src/gtk/bookmarks.c:850 ../src/gtk/bookmarks.c:853
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "Редагування запису"
 
-#: ../src/gtk/bookmarks.c:891
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../src/gtk/bookmarks.c:906
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "Машина:"
 
-#: ../src/gtk/bookmarks.c:919
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../src/gtk/bookmarks.c:936
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtk/bookmarks.c:960
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "Віддалений каталог:"
 
-#: ../src/gtk/bookmarks.c:973
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "Локальний каталог:"
 
-#: ../src/gtk/bookmarks.c:990
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "Користувач:"
 
-#: ../src/gtk/bookmarks.c:1003 ../src/text/textui.c:86
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gtk/bookmarks.c:1017
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "Обліковий запис:"
 
-#: ../src/gtk/bookmarks.c:1031
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "Реєструватися як ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1056 ../src/gtk/bookmarks.c:1309
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:380
-#: ../src/gtk/options_dialog.c:1219 ../src/gtk/options_dialog.c:1453
-msgid "  Cancel  "
-msgstr "  Скасувати  "
-
-#: ../src/gtk/bookmarks.c:1065 ../src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "Застосувати"
-
-#: ../src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/Файл/tearoff"
 
-#: ../src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: src/gtk/bookmarks.c:1156
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Файл/Створити теку..."
 
-#: ../src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: src/gtk/bookmarks.c:1157
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Файл/Новий елемент..."
 
-#: ../src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: src/gtk/bookmarks.c:1158
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: ../src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: src/gtk/bookmarks.c:1159
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Файл/Властивості..."
 
-#: ../src/gtk/bookmarks.c:1221
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/Файл/sep"
 
-#: ../src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: src/gtk/bookmarks.c:1161
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Файл/Закрити"
 
-#: ../src/gtk/bookmarks.c:1240 ../src/gtk/bookmarks.c:1243
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "Редагування закладок"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "Змінити права"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2053,91 +2060,90 @@ msgstr ""
 "Ви можете настроїти ознаки ваших файлів\n"
 "Зауважте, що не всі сервери FTP підтримують цю можливість"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "Спеціальні"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "Стійкість"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:748
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "Користувач"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "Зчитування"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "Запис"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "Виконання"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:749
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "Група"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "Інші"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "Ви впевнені, що бажаєте видалити ці %ld файлів і %ld каталогів?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "Дійсно бажаєте видалити ці %ld файлів?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "Ви впевнені, що бажаєте видалити ці %ld каталогів?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "Видалення файлів і каталогів"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1305
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "Видалити"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1064 ../src/gtk/misc-gtk.c:946
-#: ../src/gtk/misc-gtk.c:1020
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "З'єднання"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Отримано %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Перетягування-кидання"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "Вийти"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2145,472 +2151,508 @@ msgstr ""
 "Триває передача деяких файлів.\n"
 "Ви впевнені, що бажаєте вийти?"
 
-#: ../src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr "Під'єднатися за посиланням"
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
+#, fuzzy
+msgid "Open Location"
+msgstr "Параметри"
 
-#: ../src/gtk/gftp-gtk.c:198
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "Введіть URL для з'єднання"
 
-#: ../src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "Відкриття посилання"
-
-#: ../src/gtk/gftp-gtk.c:244
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:245
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: src/gtk/gftp-gtk.c:265
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Вікно 1"
 
-#: ../src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Вікно 2"
 
-#: ../src/gtk/gftp-gtk.c:250 ../src/gtk/gftp-gtk.c:255
-#: ../src/gtk/gftp-gtk.c:258
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: src/gtk/gftp-gtk.c:270
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii"
 
-#: ../src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/Двійкові дані"
 
-#: ../src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Параметри..."
+#: src/gtk/gftp-gtk.c:275
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Файл/Властивості..."
 
-#: ../src/gtk/gftp-gtk.c:259
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/Ви_йти"
 
-#: ../src/gtk/gftp-gtk.c:260
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/_Локально"
 
-#: ../src/gtk/gftp-gtk.c:261
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/Локально/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: src/gtk/gftp-gtk.c:281
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Локально/Відкрити URL..."
 
-#: ../src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Локально/Від'єднатись"
 
-#: ../src/gtk/gftp-gtk.c:264 ../src/gtk/gftp-gtk.c:270
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/Локально/sep"
 
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Локально/Змінити фільтр відбору файлів..."
 
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
+#: src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Локально/Показати виділене"
 
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
+#: src/gtk/gftp-gtk.c:288
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Локально/Виділити все"
 
-#: ../src/gtk/gftp-gtk.c:268
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/Локально/Виділити всі файли"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/Локально/Зняти виділення"
 
-#: ../src/gtk/gftp-gtk.c:271
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/Локально/Зберегти список файлів..."
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/Локально/Відіслати команду SITE..."
 
-#: ../src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: src/gtk/gftp-gtk.c:294
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Локально/Змінити каталог"
 
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
+#: src/gtk/gftp-gtk.c:295
+#, fuzzy
+msgid "/Local/_Permissions..."
 msgstr "/Локально/Змінити права..."
 
-#: ../src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Локально/Створити каталог..."
+#: src/gtk/gftp-gtk.c:297
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Файл/Створити теку..."
 
-#: ../src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
+#: src/gtk/gftp-gtk.c:298
+#, fuzzy
+msgid "/Local/Rena_me..."
 msgstr "/Локально/Перейменувати..."
 
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
+#: src/gtk/gftp-gtk.c:300
+#, fuzzy
+msgid "/Local/_Delete..."
 msgstr "/Локально/Видалити..."
 
-#: ../src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
+#: src/gtk/gftp-gtk.c:302
+#, fuzzy
+msgid "/Local/_Edit..."
 msgstr "/Локально/Правка..."
 
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
+#: src/gtk/gftp-gtk.c:303
+#, fuzzy
+msgid "/Local/_View..."
 msgstr "/Локально/Показати..."
 
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
+#: src/gtk/gftp-gtk.c:304
+#, fuzzy
+msgid "/Local/_Refresh"
 msgstr "/Локально/Поновити"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/_Віддалено"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/Віддалено/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
+#: src/gtk/gftp-gtk.c:308
+#, fuzzy
+msgid "/Remote/_Open Location..."
 msgstr "/Віддалено/_Відкрити посилання..."
 
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
+#: src/gtk/gftp-gtk.c:310
+#, fuzzy
+msgid "/Remote/D_isconnect"
 msgstr "/Віддалено/Від'єднатись"
 
-#: ../src/gtk/gftp-gtk.c:287 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/Віддалено/sep"
 
-#: ../src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
+#: src/gtk/gftp-gtk.c:313
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
 msgstr "/Віддалено/Змінити фільтр відбору файлів..."
 
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
+#: src/gtk/gftp-gtk.c:315
+#, fuzzy
+msgid "/Remote/_Show selected"
 msgstr "/Локально/Показати вибране"
 
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
+#: src/gtk/gftp-gtk.c:316
+#, fuzzy
+msgid "/Remote/Select _All"
 msgstr "/Віддалено/Вибрати все"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/Віддалено/Вибрати всі файли"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/Віддалено/Зняти вибір"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/Віддалено/Зберегти список файлів..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/Віддалено/Відіслати команду SITE..."
 
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
+#: src/gtk/gftp-gtk.c:322
+#, fuzzy
+msgid "/Remote/_Change Directory"
 msgstr "/Віддалено/Змінити каталог"
 
-#: ../src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
+#: src/gtk/gftp-gtk.c:323
+#, fuzzy
+msgid "/Remote/_Permisssions..."
 msgstr "/Віддалено/Змінити каталог..."
 
-#: ../src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr "/Віддалено/Створити каталог..."
+#: src/gtk/gftp-gtk.c:324
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Файл/Створити теку..."
 
-#: ../src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
+#: src/gtk/gftp-gtk.c:326
+#, fuzzy
+msgid "/Remote/Rena_me..."
 msgstr "/Віддалено/Перейменувати..."
 
-#: ../src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
+#: src/gtk/gftp-gtk.c:328
+#, fuzzy
+msgid "/Remote/_Delete..."
 msgstr "/Віддалено/Видалити..."
 
-#: ../src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
+#: src/gtk/gftp-gtk.c:329
+#, fuzzy
+msgid "/Remote/_Edit..."
 msgstr "/Віддалено/Правка..."
 
-#: ../src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
+#: src/gtk/gftp-gtk.c:330
+#, fuzzy
+msgid "/Remote/_View..."
 msgstr "/Віддалено/Показати..."
 
-#: ../src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
+#: src/gtk/gftp-gtk.c:331
+#, fuzzy
+msgid "/Remote/_Refresh"
 msgstr "/Віддалено/Поновити"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/_Закладки"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/Закладки/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
+#: src/gtk/gftp-gtk.c:335
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
 msgstr "/Закладки/Додати закладку"
 
-#: ../src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
+#: src/gtk/gftp-gtk.c:337
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/Додати/Виправити закладку"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/Закладки/sep"
 
-#: ../src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
+#: src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/_Transfer"
 msgstr "/_Передача"
 
-#: ../src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
+#: src/gtk/gftp-gtk.c:340
+#, fuzzy
+msgid "/Transfer/tearoff"
 msgstr "/Передача/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/Передача/Розпочати передачу"
+#: src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/Передача/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/Передача/Припинити передачу"
+#: src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/Передача/sep"
 
-#: ../src/gtk/gftp-gtk.c:315 ../src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/sep"
 msgstr "/Передача/sep"
 
-#: ../src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
+#: src/gtk/gftp-gtk.c:345
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
 msgstr "/Передача/Пропустити поточний файл"
 
-#: ../src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
+#: src/gtk/gftp-gtk.c:346
+#, fuzzy
+msgid "/Transfer/_Remove File"
 msgstr "/Передача/Вилучити файл"
 
-#: ../src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
+#: src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/Move File _Up"
 msgstr "/Передача/Перемісти файл вверх"
 
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
+#: src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Down"
 msgstr "/Передача/Перемістити файл вниз"
 
-#: ../src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
+#: src/gtk/gftp-gtk.c:353
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
 msgstr "/Передача/Отримати файли"
 
-#: ../src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
+#: src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/_Put Files"
 msgstr "/Передача/Викласти файли"
 
-#: ../src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
+#: src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/L_og"
 msgstr "/_Журнал"
 
-#: ../src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
+#: src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Log/tearoff"
 msgstr "/Журнал/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
+#: src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/Log/_Clear"
 msgstr "/Журнал/Очистити"
 
-#: ../src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
+#: src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/_View"
 msgstr "/Журнал/Показати журнал"
 
-#: ../src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
+#: src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Save..."
 msgstr "/Журнал/Зберегти журнал..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/С_ервіс"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/Сервіс/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
+#: src/gtk/gftp-gtk.c:362
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
 msgstr "/Сервіс/Порівняти вікна"
 
-#: ../src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
+#: src/gtk/gftp-gtk.c:363
+#, fuzzy
+msgid "/Tools/_Clear Cache"
 msgstr "/Сервіс/Очистити кеш"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/Довідка"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/Довідка/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#: src/gtk/gftp-gtk.c:366
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Довідка/Про програму..."
 
-#: ../src/gtk/gftp-gtk.c:458
-msgid "Host: "
-msgstr "Машина: "
-
-#: ../src/gtk/gftp-gtk.c:460
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "_Машина: "
 
-#: ../src/gtk/gftp-gtk.c:486
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtk/gftp-gtk.c:507
-msgid "User: "
-msgstr "Користувач: "
-
-#: ../src/gtk/gftp-gtk.c:509
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "_Користувач: "
 
-#: ../src/gtk/gftp-gtk.c:534
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "Пароль: "
 
-#: ../src/gtk/gftp-gtk.c:604
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "Команда:"
 
-#: ../src/gtk/gftp-gtk.c:746 ../src/gtk/gftp-gtk.c:952
-#: ../src/gtk/gtkui_transfer.c:216
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "Файл"
 
-#: ../src/gtk/gftp-gtk.c:747
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "Розмір"
 
-#: ../src/gtk/gftp-gtk.c:750
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "Дата"
 
-#: ../src/gtk/gftp-gtk.c:751
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "Ознаки"
 
-#: ../src/gtk/gftp-gtk.c:953
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "Поступ"
 
-#: ../src/gtk/gftp-gtk.c:1094
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Помилка: необхідно ввести сервер для встановлення з'єднання\n"
 
-#: ../src/gtk/gtkui.c:51
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Поновити"
 
-#: ../src/gtk/gtkui.c:96
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Введіть ім'я користувача"
 
-#: ../src/gtk/gtkui.c:97
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Введіть ім'я користувача для цього сайту"
 
-#: ../src/gtk/gtkui.c:119 ../src/gtk/transfer.c:555 ../src/gtk/transfer.c:565
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Введіть ваш пароль для цього сайту"
 
-#: ../src/gtk/gtkui.c:274
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "Операцію скасовано... необхідно ввести рядок\n"
 
-#: ../src/gtk/gtkui.c:320
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Створити каталог"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "Створити каталог"
 
-#: ../src/gtk/gtkui.c:323
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "Введіть назву каталогу"
 
-#: ../src/gtk/gtkui.c:346 ../src/gtk/gtkui.c:358 ../src/gtk/misc-gtk.c:949
-#: ../src/gtk/misc-gtk.c:1023
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: ../src/gtk/gtkui.c:356
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Як перейменувати %s?"
 
-#: ../src/gtk/gtkui.c:378 ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "Сервер"
 
-#: ../src/gtk/gtkui.c:381
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "Введіть специфічну для сервера команду"
 
-#: ../src/gtk/gtkui.c:382
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "Попереду SITE"
 
-#: ../src/gtk/gtkui.c:425 ../src/gtk/menu-items.c:250
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Змінити каталог"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:450
-#: ../src/gtk/transfer.c:533 ../src/gtk/transfer.c:1012
+#: 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:512
-#: ../src/gtk/transfer.c:537
+#: src/gtk/gtkui_transfer.c:62 src/gtk/transfer.c:520 src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: ../src/gtk/gtkui_transfer.c:124 ../src/gtk/gtkui_transfer.c:303
-#: ../src/gtk/gtkui_transfer.c:333
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "Переписати"
 
-#: ../src/gtk/gtkui_transfer.c:131 ../src/gtk/gtkui_transfer.c:309
-#: ../src/gtk/gtkui_transfer.c:339
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "Продовжити"
 
-#: ../src/gtk/gtkui_transfer.c:138 ../src/gtk/gtkui_transfer.c:306
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "Пропустити"
 
-#: ../src/gtk/gtkui_transfer.c:219
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "Дія"
 
-#: ../src/gtk/gtkui_transfer.c:224 ../src/gtk/gtkui_transfer.c:233
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Передати файли"
 
-#: ../src/gtk/gtkui_transfer.c:245
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2618,61 +2660,60 @@ msgstr ""
 "Ці файли існують як на локальній, так і на віддаленій машині\n"
 "Вкажіть, що необхідно зробити"
 
-#: ../src/gtk/gtkui_transfer.c:312
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "Помилка"
 
-#: ../src/gtk/gtkui_transfer.c:345
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "Пропустити файл"
 
-#: ../src/gtk/gtkui_transfer.c:355
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "Вибрати все"
 
-#: ../src/gtk/gtkui_transfer.c:361
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "Зняти вибір"
 
-#: ../src/gtk/menu-items.c:37
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr ""
 "Зміна фільтра відбору файлів: операцію скасовано... необхідно ввести рядок\n"
 
-#: ../src/gtk/menu-items.c:74 ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Змінити фільтр відбору файлів"
 
-#: ../src/gtk/menu-items.c:77
+#: src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Введіть новий фільтр відбору файлів"
 
-#: ../src/gtk/menu-items.c:105 ../src/gtk/menu-items.c:313
-#: ../src/gtk/menu-items.c:377 ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Помилка: не вдається відкрити %s на запис: %s\n"
 
-#: ../src/gtk/menu-items.c:134
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Зберегти список елементів каталогу"
 
-#: ../src/gtk/menu-items.c:341 ../src/gtk/menu-items.c:405
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Помилка: не вдається записати у %s: %s\n"
 
-#: ../src/gtk/menu-items.c:416
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Файл журналу успішно збережено у %s\n"
 
-#: ../src/gtk/menu-items.c:428
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "Зберегти журнал"
 
-#: ../src/gtk/menu-items.c:464
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
@@ -2681,44 +2722,39 @@ msgstr ""
 "Не вдається знайти файл ліцензійної угоди COPYING. Переконайтесь, що він або "
 "в %s, або в %s"
 
-#: ../src/gtk/menu-items.c:468 ../src/gtk/menu-items.c:473
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "Про gFTP"
 
-#: ../src/gtk/menu-items.c:504
-#, c-format
+#: src/gtk/menu-items.c:460
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "Official Homepage: http://www.gftp.org/\n";
-"Logo by: Aaron Worley <planet_hoth yahoo com>\n"
 msgstr ""
 "%s\n"
 "Авторське право © 1998-2003 Brian Masney <masneyb gftp org>\n"
 "Офіційна сторінка: http://www.gftp.org/\n";
 "Автор логотипу: Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:516
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/gtk/menu-items.c:565
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "Ліцензійна угода"
 
-#: ../src/gtk/menu-items.c:571 ../src/gtk/view_dialog.c:404
-msgid "  Close  "
-msgstr " Закрити "
-
-#: ../src/gtk/menu-items.c:655
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "Порівняти вікна"
 
-#: ../src/gtk/misc-gtk.c:253
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "Закрити з'єднання з віддаленим сервером"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2726,72 +2762,56 @@ msgstr ""
 "З'єднатись з вказаним сайтом на вузлі. Якщо запис про вузол порожній, "
 "з'явиться діалогове вікно з пропозицією ввести  URL."
 
-#: ../src/gtk/misc-gtk.c:304
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "Всі файли"
 
-#: ../src/gtk/misc-gtk.c:311
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (кешовано) ["
 
-#: ../src/gtk/misc-gtk.c:336
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "Немає з'єднання"
 
-#: ../src/gtk/misc-gtk.c:439
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Помилка відкриття файла %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: немає з'єднання з віддаленим сервером\n"
 
-#: ../src/gtk/misc-gtk.c:535
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: ця можливість не доступна з цим протоколом\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: необхідно вибрати лише один елемент\n"
 
-#: ../src/gtk/misc-gtk.c:550
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: необхідно вибрати хоча б один елемент\n"
 
-#: ../src/gtk/misc-gtk.c:943 ../src/gtk/misc-gtk.c:1017
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "Змінити"
 
-#: ../src/gtk/misc-gtk.c:1014 ../src/gtk/options_dialog.c:1280
-msgid "Add"
-msgstr "Додати"
-
-#: ../src/gtk/misc-gtk.c:1040
-msgid "Cancel"
-msgstr "Скасувати"
-
-#: ../src/gtk/misc-gtk.c:1110
-msgid "  Yes  "
-msgstr "  Так  "
-
-#: ../src/gtk/misc-gtk.c:1120
-msgid "  No  "
-msgstr "  Ні  "
-
-#: ../src/gtk/misc-gtk.c:1180
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "Отримання списку каталогу"
 
-#: ../src/gtk/misc-gtk.c:1200
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr " Зупинити "
 
-#: ../src/gtk/misc-gtk.c:1210
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2800,105 +2820,89 @@ msgstr ""
 "Отримано %ld каталогів\n"
 "і %ld файлів"
 
-#: ../src/gtk/misc-gtk.c:1286
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "Помилка gFTP: не вдається знайти файл %s у %s чи %s\n"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "Редагувати машину"
 
-#: ../src/gtk/options_dialog.c:959
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "Додати машину"
 
-#: ../src/gtk/options_dialog.c:1005
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../src/gtk/options_dialog.c:1007
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../src/gtk/options_dialog.c:1017 ../src/gtk/options_dialog.c:1140
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/gtk/options_dialog.c:1050
-msgid "Network Address"
-msgstr "Мережна адреса"
-
-#: ../src/gtk/options_dialog.c:1052
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "_Мережна адреса:"
 
-#: ../src/gtk/options_dialog.c:1091 ../src/gtk/options_dialog.c:1244
-msgid "Netmask"
-msgstr "Маска мережі"
-
-#: ../src/gtk/options_dialog.c:1093
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "_Маска мережі:"
 
-#: ../src/gtk/options_dialog.c:1142
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "_Домен:"
 
-#: ../src/gtk/options_dialog.c:1250
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "Маска мережі"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "Локальні машини"
 
-#: ../src/gtk/options_dialog.c:1291 ../src/gtk/view_dialog.c:105
-msgid "Edit"
-msgstr "Редагувати"
-
-#: ../src/gtk/options_dialog.c:1293
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../src/gtk/options_dialog.c:1370 ../src/gtk/options_dialog.c:1375
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "Параметри"
 
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Отримання назв файлів..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:681
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Встановлення з'єднання..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Отримання файлів: не встановлено з'єднання з віддаленим сервером\n"
 
-#: ../src/gtk/transfer.c:351
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Помилка: дочірній процес %d повернув %d\n"
 
-#: ../src/gtk/transfer.c:358
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Успішне повернення від дочірнього процесу %d\n"
 
-#: ../src/gtk/transfer.c:362
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Помилка: дочірній процес %d не завершився відповідним чином\n"
 
-#: ../src/gtk/transfer.c:372
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Помилка: не вдається отримати інформацію про файл %s: %s\n"
 
-#: ../src/gtk/transfer.c:377
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Файл %s не було змінено\n"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2907,122 +2911,214 @@ msgstr ""
 "Файл %s було змінено.\n"
 "Бажаєте відвантажити його?"
 
-#: ../src/gtk/transfer.c:388
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Редагування файла"
 
-#: ../src/gtk/transfer.c:453
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Завершено"
 
-#: ../src/gtk/transfer.c:493
-#, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Зупинка передачі %s\n"
-
-#: ../src/gtk/transfer.c:727
-#, c-format
-msgid "Unknown percentage complete. (File %ld of %ld)"
-msgstr "Невідомий відсоток виконання. (Файл %ld з %ld)"
-
-#: ../src/gtk/transfer.c:731
-#, c-format
-msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
+#: src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
-"%d%% завершено, очікуваний час до завершення: %02d:%02d:%02d, файл %ld з %ld"
+"Отримання %s з %s на %.2fкб/с, очікуваний час до завершення: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:761
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "Отримання %s з %s на %.2fкб/с, очікуваний час до завершення: %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:770
+#: src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr ""
+"Отримання %s з %s, передача призупинилась, час до завершення не відомий"
+
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr ""
 "Отримання %s з %s, передача призупинилась, час до завершення не відомий"
 
-#: ../src/gtk/transfer.c:805
+#: src/gtk/transfer.c:800
+#, c-format
+msgid "Unknown percentage complete. (File %ld of %ld)"
+msgstr "Невідомий відсоток виконання. (Файл %ld з %ld)"
+
+#: 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, файл %ld з %ld"
+
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Отримання назв файлів... %s байтів"
 
-#: ../src/gtk/transfer.c:884 ../src/gtk/transfer.c:906
-#: ../src/gtk/transfer.c:940 ../src/gtk/transfer.c:980
-#: ../src/gtk/transfer.c:1033 ../src/gtk/transfer.c:1093
+#: 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"
 
-#: ../src/gtk/transfer.c:924
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Припинення передачі з сервером %s\n"
-
-#: ../src/gtk/transfer.c:965 ../src/gtk/transfer.c:1018
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Пропуск файла %s на сервері %s\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:34
+msgid "Edit"
+msgstr "Редагувати"
+
+#: 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:271
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Відкриття %s за допомогою %s\n"
 
-#: ../src/gtk/view_dialog.c:306
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Перегляд файла %s\n"
 
-#: ../src/gtk/view_dialog.c:313
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Перегляд: не вдається відкрити файл %s: %s\n"
 
-#: ../src/text/gftp-text.c:176
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Не вдається відкрити керуючий термінал %s\n"
 
-#: ../src/text/textui.c:74
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Користувач [anonymous]:"
 
-#: ../src/text/textui.c:143
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s вже існує. (%s джерело, %s цільовий файл):\n"
 "(o)перезаписати, (r)продовжити, (s)пропустити, (O)перезаписати все, (R)"
 "продовжити все, (S)Пропустити все: (%c)"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Startup Directory:"
+#~ msgstr "Початковий каталог:"
+
+#~ msgid "The default directory gFTP will go to on startup"
+#~ msgstr "Каталог, в який gFTP переходитиме під час запуску"
+
+#~ msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+#~ msgstr "Помилка перетворення рядка '%s' у UTF-8 з поточної локалі: %s\n"
+
+#~ msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+#~ msgstr "Помилка перетворення рядка '%s' у поточну локаль з UTF-8: %s\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 ""
+#~ ">. Якщо у вас є запитання, коментарі чи зауваження щодо цієї програми, ви "
+#~ "можете написати мені про це електронною поштою. Ви можете також знайти "
+#~ "останні новини про gFTP на моєму сайті за адресою http://www.gftp.org/\n";
+
+#~ msgid "Error: Remote site disconnected after trying to transfer file\n"
+#~ msgstr ""
+#~ "Помилка: розірвано з'єднання з віддаленим сервером після спроби передати "
+#~ "файл\n"
+
+#~ msgid "There was an error transfering the file %s"
+#~ msgstr "Помилка передавання файлу %s"
+
+#~ msgid "  Cancel  "
+#~ msgstr "  Скасувати  "
+
+#~ msgid "Apply"
+#~ msgstr "Застосувати"
+
+#~ msgid "Connect via URL"
+#~ msgstr "Під'єднатися за посиланням"
+
+#~ msgid "OpenURL"
+#~ msgstr "Відкриття посилання"
+
+#~ msgid "/FTP/_Options..."
+#~ msgstr "/FTP/_Параметри..."
+
+#~ msgid "/Local/Make Directory..."
+#~ msgstr "/Локально/Створити каталог..."
+
+#~ msgid "/Remote/Make Directory..."
+#~ msgstr "/Віддалено/Створити каталог..."
+
+#~ msgid "/Transfers/Start Transfer"
+#~ msgstr "/Передача/Розпочати передачу"
+
+#~ msgid "/Transfers/Stop Transfer"
+#~ msgstr "/Передача/Припинити передачу"
+
+#~ msgid "Host: "
+#~ msgstr "Машина: "
+
+#~ msgid "User: "
+#~ msgstr "Користувач: "
+
+#~ msgid "  Close  "
+#~ msgstr " Закрити "
+
+#~ msgid "Add"
+#~ msgstr "Додати"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid "  Yes  "
+#~ msgstr "  Так  "
+
+#~ msgid "  No  "
+#~ msgstr "  Ні  "
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Network Address"
+#~ msgstr "Мережна адреса"
+
+#~ msgid "_Edit"
+#~ msgstr "_Правка"
+
+#~ msgid "Stopping the transfer of %s\n"
+#~ msgstr "Зупинка передачі %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45e77f6..e3f6e7f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,97 +8,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&component=general\n"
-"POT-Creation-Date: 2010-01-27 00:53+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2010-07-25 19:18+0800\n"
 "Last-Translator: du baodao <centerpoint 139 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "无效的 URL %s\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "错误:缓存索引文件里的第 %s 行非法\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "在将字符串“%s”从字符集 %s 转换成字符集 %s 时出错:%s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "错误:无法打开本地文件 %s:%s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "错误:无法写套接字:%s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "错误:无法读套接字:%s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "警告:找不到主书签文件 %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP 警告:跳过书签文件第 %d 行:%s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP 警告:第 %d 行参数不足\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -107,7 +106,7 @@ msgstr ""
 "本节指定了本地子网中包含哪些主机,而无须使用代理服务器(若代理可用)。语法:"
 "dont_use_proxy=.domain 或 dont_use_proxy=网络号/子网掩码"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -115,52 +114,52 @@ msgstr ""
 "ext=文件扩展名:XPM file:Ascii 或 Binary (A 或 B):查看程序。注意:除文件扩展"
 "名外的全部参数都是可选的"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "您是否进行了 make install?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP 错误:不正确的日志文件名 %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -168,7 +167,7 @@ msgstr ""
 "gFTP 书签文件。版权所有 (C) 1998-2003 Brian Masney <masneyb gftp org>。警告:"
 "您添加到此文件中的任何信息都将被覆盖"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -179,7 +178,7 @@ msgstr ""
 "当你在编辑这个文件的时候,通过站在你背后偷看你的输入从而记住你的输入。在这以"
 "前,所有的密码都是明文形式保存的。"
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -189,245 +188,242 @@ msgstr ""
 "添加到此文件中的任何信息都会被覆盖。如果某个条目的注释里有一个(*),则您不能"
 "在 gFTP 中修改它"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "错误:无法打上传地文件 %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "错误:无法写入文件 %s:%s\n"
 
 # msgid "Error: Cannot write to file %s: %s\n"
 # msgstr "错误:无法写入文件 %s\n"
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "错误:关闭文件出错:%s\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "从 FSP 服务器 %s 获得文件列表中断\n"
 
-#: ../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
+#: 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 "未知"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "无法获得 FSP 目录列表 %s:%s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "目录更改为 %s 成功\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "无法将目录更改为 %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "删除 %s 成功\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "错误:无法删除文件 %s:%s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: 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
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr "HTTPS 支持不可用,原因是未将 SSL 支持编译进来。中止连接。\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "无法获得当前工作目录:%s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "将本地目录更改为 %s 成功\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "无法将本地目录更改为 %s:%s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "错误:无法截断本地文件 %s:%s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "无法获得本地目录列表 %s:%s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "将 %s 的权限更改为 %o 成功\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "错误:无法将 %s 的权限更改为 %o:%s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "成功更改 %s 的时间戳\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "错误:无法更改时间戳:%s: %s\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "本地文件系统"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "用法:gftp "
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "无"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "文件"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "大小"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "用户"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "群组"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "时间日期"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "属性"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "降序"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "升序"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "常规"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "查看程序:"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "编辑程序:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "用于编辑文件的默认程序。"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "日志窗口最大大小:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "日志窗口 GTK+ 移植的最大字节大小"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "远程字符集:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr ""
 "这是用逗号分隔的字符集列表,gFTP 会使用这些字符集将远程信息转换为当前语系。"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "远程 LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -435,433 +431,437 @@ msgstr ""
 "这是远程站点所使用的 LC_TIME 的设置。它可以让目录列表的时候能够正确解析日期格"
 "式。"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "缓存 TTL:"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "缓存过期前等待的秒数。"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "追加文件传输"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "在已有文件后面追加新的传输文件"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "每次进行一次传输"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "是否每次只进行一次传输?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "默认覆盖"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "默认覆盖文件或者设置为续传文件"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "保留文件权限"
 
-#: ../lib/options.h:80
-msgid "Preserve file permissions of transfered files"
+#: lib/options.h:80
+#, fuzzy
+msgid "Preserve file permissions of transferred files"
 msgstr "保留已传输文件的权限"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "保留文件时间"
 
-#: ../lib/options.h:85
-msgid "Preserve file times of transfered files"
+#: lib/options.h:85
+#, fuzzy
+msgid "Preserve file times of transferred files"
 msgstr "保留已传输文件的时间"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "每个文件传输后刷新"
 
-#: ../lib/options.h:90
-msgid "Refresh the listbox after each file is transfered"
+#: lib/options.h:90
+#, fuzzy
+msgid "Refresh the listbox after each file is transferred"
 msgstr "每个文件传输完成后刷新文件列表框"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "先排序目录"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "先上传目录,再上传文件"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "在文件列表框中显示隐藏文件"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "在标题中显示传输状态"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "在标题栏中显示文件传输状态"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "启动文件传输"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "当文件进入队列时自动开始传输"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "在 GUI 中允许使用手工命令"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "在 GUI 中允许输入手工命令(例如可以输入 port 命令的文本)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "记住最近的目录"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "程序关闭时保存最近的本地和远程目录"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "在启动时连接到远程服务器。"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "启动程序时自动连接远程服务器。"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "网络"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "网络超时:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "等待网络输入/输出超时。这不是发呆超时。"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "连接重试次数:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "自动重试次数。设置 0 为无限次"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "重试等待时间:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "重试间隔时间(秒)"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "最大 KB/S:"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "文件传输的最大速率 KB/s。(设置 0 为禁止)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "传输块大小:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
+#, fuzzy
 msgid ""
-"The block size that is used when transfering files. This should be a "
+"The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "在传输文件的过程中所使用的块大小。它应该是1024的倍数。"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "默认协议:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "这里指定要使用的默认协议"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "启用 IPv6 的支持"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=传输文件"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "本地文件列表框的默认宽度"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "远程文件列表框的默认宽度"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "本地/远程文件列表框的默认高度"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "传输列表框的默认高度"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "日志窗口的默认高度"
 
-#: ../lib/options.h:177
+#: 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 为该栏宽度自动适应."
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "默认的排序依据列"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "升序还是降序排序"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 将禁用此列"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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 将禁用此列"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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 将禁用此列"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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 将禁用此列"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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 将禁用此列"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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 将禁用此列"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "发向服务器的命令颜色"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "从服务器发来的命令颜色"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "错误信息的颜色"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "其他日志信息的颜色"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "本地"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "书签"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "传输速度被限制为 %.2f KB/s\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "设置 LC_TIME 成 '%s' 时出错。仍使用原来的设置 '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "正在从缓存中装入目录列表 %s(LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "正在从服务器上装入目录列表 %s(LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr "警告:卸载文件路径“%s”。卸载路径(%s)与正确目录(%s)不符\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "错误:不能写入缓存:%s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "错误:找不到书签 %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "书签错误:书签项 %s 没有主机名\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "协议“%s”目前尚不支持。\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "发现循环的符号连接 %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "错误:远程服务器 %s 已断开连接。达到最大重试次数...放弃\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "错误:无法设置执行时关闭标志:%s\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "无法打开主 pty %s:%s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "创建套接字对失败:%s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "错误:无法执行 ssh:%s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "无法创建另外的子进程:%s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "代理主机名:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "防火墙主机名"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "代理端口:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "用于连接至防火墙的端口"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "代理用户名:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "您的防火墙用户名"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "代理密码:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "您的防火墙密码"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "使用 HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -870,83 +870,83 @@ msgstr ""
 "从服务器收到了错误的响应,断开连接\n"
 "远程服务器返回的块大小“%s”无效\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "正在从指定偏移处开始传输文件 "
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "无法接收文件 %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "正在接收目录列表...\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "从服务器收到错误的回应,断开连接\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE 命令"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "user host"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "user host:port"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "AUTHENTICATE"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "user host port"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "user host NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP代理"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "自定义"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "电子邮件:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "这是您以匿名身份登录到远程 FTP 服务器时所用的密码"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "代理服务器的账户:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "您的防火墙账户(可选)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "代理服务器类型:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -961,11 +961,11 @@ msgstr ""
 "p 或者是代表 FTP 服务器的 h。占位符的第二个字符可以是 u(用户名),p(密码),h"
 "(主机),o(端口)或 a(账户)。例如,要指定代理服务器的用户名,您可以输入 %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "忽略 PASV 地址"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -975,11 +975,11 @@ msgstr ""
 "如果启用此项,会忽略远程 FTP 服务器的 PASV IP 地址域并使用主机的 IP 地址。如"
 "果在 PASV 回应中路由器给出的是它的内部而不是外部 IP 地址,通常需要启用此项。"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "被动传输文件"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -993,11 +993,11 @@ msgstr ""
 "FTP 服务器老旧到不支持此功能。如果禁用了此选项,gFTP 将会在客户端打开一个端"
 "口,而远程服务器将会试图连接到该端口。"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "解析远程符号链接(LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1007,15 +1007,16 @@ msgstr ""
 "远程 FTP 服务器将试图解析目录列表中的符号链接。通常情况下,启用此选项是个不错"
 "的选择。您想要禁用此选项的唯一情况是,远程 FTP 服务器不支持 LIST 的 -L 选项"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "以 ASCII 模式传输文件"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
+#, fuzzy
 msgid ""
-"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
-"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 msgstr ""
@@ -1023,371 +1024,362 @@ msgstr ""
 "系统中新起一行的表示方法都不同。如果您从 UNIX 向 UNIX 传输,那么就应该关闭此"
 "选项。如果您正在下载二进制数据,您也许要禁用此选项。"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: 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
+#: 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:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "无法创建数据连接:%s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: 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:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "无法绑定端口:%s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "创建 IPv6 套接字失败:%s\n"
 
-#: ../lib/rfc959.c:895
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "无效的 EPSV 响应“%s”\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "无法获得本地套接字的地址:%s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "无法接受来自服务器的连接:%s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "总共"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "无法获得套接字标志:%s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "无法设置套接字为非屏蔽:%s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH 程序名称:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH 程序的路径"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH 额外参数:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "传递给 SSH 程序的额外参数"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "需要 SSH 用户名/密码"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH 连接需要一个用户名/密码"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "正在运行程序:%s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "输入 RSA 密钥的口令"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "输入口令用于保护密钥'"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "密码"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(yes/no)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "输入口令:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "输入SecurID密码:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "错误:输入的密码不对\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d:协议初始化\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d:协议版本 %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d:打开 %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d:关闭\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d:打开目录 %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d:读取目录\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d:删除文件 %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d:建立目录 %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d:删除目录 %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d:真实路径 %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d:文件属性\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d:Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d:Chmod %s %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d:Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "确定"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "文件结束"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "无此文件或目录"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "权限不允许"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "失败"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "错误信息"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "无连接"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "连接丢失"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "操作不支持"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "服务器返回的信息未知"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "错误:信息大小 %d 太大\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "正在打开到 %s 的 SSH 连接\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "成功登入 SSH 服务器 %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL 引擎"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL 熵文件:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL 熵文件"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "熵种子长度:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL 引擎种子的最大字节数"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "验证对方 SSL"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1400,56 +1392,56 @@ msgstr ""
 "主题 = %s\n"
 "错误 %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "无法获得对方证书\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
 msgstr "错误:SSL 证书中的主机(%s)和即将连接的主机(%s)不匹配。中止连接。\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "无法初始化 OpenSSL 库\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "装入默认 SSL 证书出错\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "设置加密算法列表出错(无有效的加密算法)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "错误:SSL 引擎未初始化\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "设置 SSL 连接出错(BIO 对象)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "设置 SSL 连接出错(SSL 对象)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "端点证书出错:%s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "操作被取消\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "等待 %d 秒再重新尝试连接\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1458,73 +1450,73 @@ msgstr ""
 "使用 gFTP 软件无任何担保;细节请查阅 COPYING 文件。该软件是自由软件,欢迎您遵"
 "照某些条款分发该软件;细节请查阅 COPYING 文件\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr "翻译者:GNOME 简体中文翻译组"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "用法:chmod <模式> <文件>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "用法:rename <旧名称> <新名称>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "用法:delete <文件>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "用法:rmdir <目录>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "用法:site <该站点支持的site命令>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "用法:mkdir <新目录>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "用法:chdir <目录>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "无效的参数\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "清除目录缓存\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "用法: open "
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "用法:set [变量 = 值]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "错误:变量 %s 不是一个有效的配置变量。\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "错误:在 gFTP 的文本移植中变量 %s 不可用\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1532,320 +1524,319 @@ msgstr ""
 "支持的命令:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "用法:%s <文件>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "显示 gFTP 的信息"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "将当前文件传输模式设为 Ascii 模式(仅对 FTP 有效)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "将当前文件传输模式设为二进制模式(仅对 FTP 有效)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "更改远程工作目录"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "更改远程文件的权限"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "可用的选项:cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "从远程网站断开连接"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "删除远程文件"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "显示当前远程目录下的目录列表"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "下载远程文件"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "显示此帮助屏幕"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "更改本地工作目录"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "更改本地文件的权限"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "删除本地文件"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "显示当前本地目录下的目录列表"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "创建本地目录"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "显示当前本地目录"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "重命名本地文件"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "删除本地目录"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "创建远程目录"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "上传本地文件"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "打开到远程站点的连接"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "显示当前的远程目录"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "退出 gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "重命名远程文件"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "删除远程目录"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "显示配置文件变量。您还可以通过 set 变量= 值 的方法设置变量"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "site"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "运行站点特定的命令"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "错误:命令不可识别\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: 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:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "正在跳过主机 %2$s 上的文件 %1$s\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "正在停止主机 %s 上的传输\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "无法从 %2$s 下载 %1$s\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr "有%d个文件或目录没有被传输。查看日志没有正确传输的项。"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s:请先按停止按钮再进行别的操作\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "运行书签"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "添加书签:必须为书签命名\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "添加书签:无法添加书签 %s 因为已存在同名书签\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "添加书签"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "添加书签:必须输入主机名\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1855,31 +1846,31 @@ msgstr ""
 "可以使用 / 分隔项目,将其划分为子书签\n"
 "(例:Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "记住密码"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "必须为书签命名。"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "新建文件夹"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "输入要创建的文件夹名称"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "新项目"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "输入要创建的新项目名称"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1888,106 +1879,99 @@ msgstr ""
 "您确定想要删除书签\n"
 "%s 及其全部子书签吗?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "删除书签"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "编辑项目"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "描述:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "端口:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "远程目录:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "本地目录:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "密码:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "帐户:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "匿名登录"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "   取消   "
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/文件(F)/tearoff"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/文件(F)/新文件夹(_F)..."
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/文件(F)/新项目(I)..."
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/文件(F)/删除(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/文件(F)/属性(_P)..."
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/文件(F)/sep"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/文件/关闭(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "编辑书签"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "更改权限"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1995,91 +1979,90 @@ msgstr ""
 "您现在可以调整您的文件权限\n"
 "注意:不是所有的 FTP 服务器都支持 chmod 功能"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "特殊"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "置顶"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "用户"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "读"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "写"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "执行"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "群组"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "其它"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "确定要删除这 %ld 个文件和 %ld 个目录?"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "确定要删除这 %ld 个文件"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "确定要删除这 %ld 个目录"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "删除文件或目录"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "连接"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "收到 URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "拖曳操作"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "退出"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2087,468 +2070,455 @@ msgstr ""
 "还有文件传输任务正在进行。\n"
 "您确定想要退出吗?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "打开位置"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "输入要连接的 URL"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/窗口 _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/窗口 _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/_Ascii"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/二进制(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/文件/属性(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/退出(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/本地(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/本地(L)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/本地(L)/打开位置(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/本地(L)/断开连接(_D)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/本地(L)/sep"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/本地(L)/改变文件类型(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/本地(L)/显示选中的(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/本地(L)/全选(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/本地(L)/选中全部文件"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/本地(L)/全部不选"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/本地(L)/保存目录列表..."
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/本地(L)/发送 SITE 命令..."
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/本地(L)/更改目录(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/本地(L)/权限(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/本地(L)/新文件夹(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/本地(L)/改名(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/本地(L)/删除(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/本地(L)/编辑(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/本地(L)/查看(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/本地(L)/刷新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/远程(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/远程(R)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/远程(R)/打开位置(_O)..."
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/远程(R)/断开连接(_I)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/远程(R)/sep"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/远程(R)/改变文件类型(_F)..."
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/远程(R)/显示选中的(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/远程(R)/全选(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/远程(R)/选中全部文件"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/远程(R)/全部不选"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/远程(R)/保存目录列表..."
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/远程(R)/发送 SITE 命令..."
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/远程(R)/更改目录(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/远程(R)/更改权限(_P)..."
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/文件(F)/新文件夹(_N)..."
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/远程(R)/改名(_m)..."
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/远程(R)/删除(_D)..."
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/远程(R)/编辑(_E)..."
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/远程(R)/查看(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/远程(R)/刷新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/书签(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/书签(B)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/书签(B)/添加书签(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/书签(B)/编辑书签"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/书签(B)/sep"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/传输(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/传输(T)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/传输(T)/开始(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/传输(T)/停止(_o)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/传输(T)/sep"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/传输(T)/跳过当前文件(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/传输(T)/删除文件(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/传输(T)/上移文件(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/传输(T)/下移文件(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/传输(T)/接收文件(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/传输(T)/上传文件(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/日志(_O)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/日志(O)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/日志(O)/清除(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/日志(O)/查看(_V)..."
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/日志(O)/保存日志(_S)..."
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/工具(_S)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/工具(S)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/工具(S)/比较窗口(_O)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/工具(S)/清除缓存(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/帮助(_H)"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/帮助(H)/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "主机:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "主机(_H):"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "端口:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "用户名:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "用户名(_U):"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "密码:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "命令: "
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "文件名"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "大小"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "日期"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "属性"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "进度"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "错误:必须输入主机名来建立连接\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "输入用户名"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "请输入您在该服务器上所使用的用户名"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "请输入您在该服务器上所使用的密码"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "操作取消...必须输入一个字符串\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "建立目录"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "输入要创建的目录名"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "改名"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "您想将 %s 改为什么名称?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "站点"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "输入站点特定的命令"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "把站点名称附加到开头"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "续传"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "跳过"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "操作"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "传输文件"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2556,70 +2526,70 @@ msgstr ""
 "下列文件同时存在于本地和远程计算机\n"
 "请选择如何操作"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "错误"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "跳过文件"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "全部选中"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "全部不选"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "更改文件类型:操作取消...必须输入字符串\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "更改文件类型"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "错误:无法打开 %s 写入:%s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "保存目录列表"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "错误:向 %s 写入出错:%s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "成功写入日志文件到 %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "保存日志"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "找不到许可协议文件 COPYING。请确定该文件位于 %s 或 %s 中"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "关于 gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2630,27 +2600,23 @@ msgstr ""
 "版权所有 (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
 "官方主页:http://www.gftp.org/\n";
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "关于"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "许可协议"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  关闭  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "比较窗口"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "与远程网站断开连接"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2658,72 +2624,56 @@ msgstr ""
 "连接到主机项中指定的站点。如果主机项内容为空,那么会出现一个对话框让你输入一"
 "个URL"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "全部文件"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (已缓存) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "未连接"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "打开文件 %s 出错:%s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s:未连接到远程站点\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s:该功能在本协议中不可用\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s:您只能选中一个项目\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s:您至少得选中一个项目\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "更改"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "添加"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  是  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  否  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "正在获取目录列表"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  停止  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2732,109 +2682,89 @@ msgstr ""
 "已接收 %ld 个目录\n"
 "和 %ld 个文件"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP 错误:在 %2$s 或 %3$s 找不到文件 %1$s\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "编辑主机"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "添加主机"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "类型:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "类型(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "域"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "网络地址"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "网络地址(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "子网掩码"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "子网掩码(_E):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "域(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "子网掩码"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "本地主机"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "编辑"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "选项"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "应用"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "正在接收文件名..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "接收文件:未连接到远程站点\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "错误:子线程 %d 返回 %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "子线程 %d 成功返回\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "错误:子线程 %d 没有正常终止\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "错误:无法获得关于文件 %s 的信息:%s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "文件 %s 没有更改\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2843,117 +2773,156 @@ msgstr ""
 "文件 %s 已经更改。\n"
 "您想要上传吗?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "编辑文件"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "已完成"
 
-#: ../src/gtk/transfer.c:734
+#: 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:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "已接收 %s,共 %s (速度 %.2fKB/s),预计剩余时间 %02d:%02d:%02d"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "已接收 %s,共 %s,传输延迟,剩余时间未知"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "已接收 %s,共 %s,传输延迟,剩余时间未知"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "完成百分率未知。(文件 %ld 共 %ld )"
 
-#: ../src/gtk/transfer.c:804
+#: 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。(第 %ld 个文件,共 %ld 个)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "正在接收文件名...%s 字节"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "查看"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "编辑"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "查看:无法创建另外的子进程:%s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "正在运行程序:%s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "正在用 %2$s 打开 %1$s\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "正在查看文件 %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "查看:无法打开文件 %s:%s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "无法打开控制终端 %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "用户名[anonymous]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
-"c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: "
+"(%c)"
 msgstr ""
 "%s 已经存在。(源大小为 %s,目标大小为 %s):\n"
 "(o)覆盖,(r)续传,(s)跳过,(O)覆盖所有,(R)续传所有,(S)跳过所有:(%c)"
 
+#~ msgid "  Cancel  "
+#~ msgstr "   取消   "
+
+#~ msgid "Host: "
+#~ msgstr "主机:"
+
+#~ msgid "User: "
+#~ msgstr "用户名:"
+
+#~ msgid "  Close  "
+#~ msgstr "  关闭  "
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "  Yes  "
+#~ msgstr "  是  "
+
+#~ msgid "  No  "
+#~ msgstr "  否  "
+
+#~ msgid "Type:"
+#~ msgstr "类型:"
+
+#~ msgid "Network Address"
+#~ msgstr "网络地址"
+
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "应用"
+
 #~ 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 "
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8575e64..eb4e574 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,98 +9,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 2.0.19\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-20 12:04+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2012-09-24 22:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
-"Language: \n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s 無效\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "錯誤:快取記憶索引檔中的這一列無效:%s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "在轉換字串‘%s’裏的字符集 %s 到另一種字符集 %s: %s 時發生錯誤\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "錯誤:無法開啟本地主機檔案 %s:%s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "錯誤:無法寫入 socket:%s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "錯誤:無法讀取 socket:%s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "警告:找不到主書籤檔 %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP 警告:略過書籤檔第 %d 列:%s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP 警告:第 %d 列參數不足\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -109,7 +107,7 @@ msgstr ""
 "這裏可列出屬於本地網域,不需連上代理伺服器 (若適用) 的主機。\n"
 "語法:dont_use_proxy=.domain 或 dont_use_proxy=network_number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -117,740 +115,763 @@ msgstr ""
 "ext=延伸檔名:XPM 檔案:純文字/二進位模式(A 或 B):檢視程式\n"
 "註:延伸檔名以外的其它欄位都可以不填"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "你有執行 make install 嗎?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP 錯誤:錯誤的記錄檔名稱 %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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 書籤檔。 版權所有 ©1998-2007 Brian Masney <masneyb gftp org>。 警告:任何加入此檔案的更改都會被覆寫。"
+msgstr ""
+"gFTP 書籤檔。 版權所有 ©1998-2007 Brian Masney <masneyb gftp org>。 警告:任"
+"何加入此檔案的更改都會被覆寫。"
 
-#: ../lib/config_file.c:733
+#: 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 "
 "someone standing over your shoulder while you're editing this file. Prior to "
 "this, all passwords were stored in plaintext."
-msgstr "注意︰在那個檔案裏所包含的密碼是拼湊而成的,因此這個算法並不安全。這是為了防止當你在編輯這個檔案時,你的密碼會被某人看到和容易的記得到。在這之前,所有密碼均以純文字格式來儲存。"
+msgstr ""
+"注意︰在那個檔案裏所包含的密碼是拼湊而成的,因此這個算法並不安全。這是為了防"
+"止當你在編輯這個檔案時,你的密碼會被某人看到和容易的記得到。在這之前,所有密"
+"碼均以純文字格式來儲存。"
 
-#: ../lib/config_file.c:845
+#: 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 組態檔。 版權所有 ©1998-2007 Brian Masney <masneyb gftp org>。 警告:任何加入此檔案的更改都會被覆寫。 若某項目含有 (*),表示該項目無法在 
gFTP 中更改。"
+msgstr ""
+"gFTP 組態檔。 版權所有 ©1998-2007 Brian Masney <masneyb gftp org>。 警告:任"
+"何加入此檔案的更改都會被覆寫。 若某項目含有 (*),表示該項目無法在 gFTP 中更"
+"改。"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<不明>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "錯誤:無法上傅檔案 %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "錯誤:無法寫入至檔案 %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "錯誤: 關閉檔案%s時發生錯誤\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "來自FSP伺服器 %s 的損壞檔案清單\n"
 
-#: ../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
+#: 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 "不明"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "無法取得FSP目錄清單 %s:%s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "成功更改目錄至 %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "無法更改目錄至 %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "成功移除 %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "錯誤:無法移除檔案 %s:%s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "因為支援SSL的程式碼沒有被編譯在內,故此無法提供FTPS的支援,正中斷連線。\n"
+msgstr ""
+"因為支援SSL的程式碼沒有被編譯在內,故此無法提供FTPS的支援,正中斷連線。\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
-msgstr "因為支援SSL的程式碼沒有被編譯在內,故此無法提供HTTPS的支援,正中斷連線。\n"
+msgstr ""
+"因為支援SSL的程式碼沒有被編譯在內,故此無法提供HTTPS的支援,正中斷連線。\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "無法取得當前工作中的目錄:%s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "成功更改本地主機目錄至 %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "無法更改本地主機目錄至 %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "錯誤:無法截斷本地主機檔案 %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "無法取得本地主機目錄的清單 %s:%s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "成功更改模式 %s 為 %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "錯誤:無法更改模式 %s 為 %o:%s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "成功更改 %s 的時間戳記\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "錯誤:無法更改 %s: %s 的時間戳記\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "本機檔案系統"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "用法︰ gftp"
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "無"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "檔案"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "大小"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "使用者"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "羣組"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "時間"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "屬性"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "遞減"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "遞增"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "一般"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "檢視程式:"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "編輯程式:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "預設用來編輯檔案的程式。"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "日誌視窗最大記憶量:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "在 GTK+ 版本中,日誌視窗佔用的記憶體最大值 (位元組)"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "遠端字符集:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr "這是一個用逗號分隔開的字符集清單,並且嘗試把遠端的信息轉換成當前的語系"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "遠端的 LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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 之數值,所以所有日期能夠正確地分列在目錄清單裏。"
+msgstr ""
+"這是一個為遠端站臺而設的遠端 LC_TIME 之數值,所以所有日期能夠正確地分列在目錄"
+"清單裏。"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "快取記憶之總量︰"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "在那些快取記憶裏之記錄到期前,保存它們的秒數。"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "傳送時附加至現有的檔案"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "傳送新的檔案時將資料附加至現有的檔案末端"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "每次只傳送一個檔案"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "每次是否只傳送一個檔案?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "預設為覆寫檔案"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "預設為覆寫檔案或續傳檔案"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "保留檔案權限"
 
-#: ../lib/options.h:80
+#: lib/options.h:80
 msgid "Preserve file permissions of transferred files"
 msgstr "保留被傳送檔案的檔案權限"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "保留檔案時間"
 
-#: ../lib/options.h:85
+#: lib/options.h:85
 msgid "Preserve file times of transferred files"
 msgstr "保留被傳送檔案的檔案時間"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "每次檔案傳送後更新畫面"
 
-#: ../lib/options.h:90
+#: lib/options.h:90
 msgid "Refresh the listbox after each file is transferred"
 msgstr "每次檔案傳送後更新檔案清單"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "先排列目錄"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "先排列目錄,再排列檔案"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "顯示隱藏檔案"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "在檔案清單中顯示隱藏檔案"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "以標題形式顯示傳送狀態"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "在標題列裏顯示檔案傳送狀態"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "開始檔案傳送"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "當輪到你時檔案傳送會自動開始"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "容許在GUI裏手動輸入指令"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "容許在 GUI 裏手動輸入指令(類似文字埠的功能)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "記住上次使用的目錄"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "關閉應用軟件時,儲存上次使用的本地與遠端目錄"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "啟動時與遠端伺服器連線"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "當應用軟件啟動時,自動與遠端伺服器連線"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "網絡"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "連線時限:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "等待網絡輸入/輸出的時限。此項設定不同於連線後的閒置時間。"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "連線重試次數:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "自動重試次數,設為 0 表示會不斷重試"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "重試前的等待時間:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "每次重試前等待指定秒數"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "最大傳送速度(KB/S):"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "檔案傳送最大速度 (KB/S)。(設為 0 會關閉此功能)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "傳送的數據塊大小:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "在傳送檔案時是以數據塊大小做為單位,其數值應該是 1024 的倍數。"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "預設協定:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "指定預設使用的協定"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "啟動 IPv6 的支援"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=傳送檔案"
+msgstr ""
+"在檔案清單中連按兩下檔案時表示的操作程序。0=查看檔案 1=編輯檔案 2=傳送檔案"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "本地主機檔案清單的預設闊度"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "遠端主機檔案清單的預設闊度"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "本地或遠端主機檔案清單的預設高度"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "檔案傳送清單的預設高度"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "日誌視窗的預設高度"
 
-#: ../lib/options.h:177
+#: 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 表示欄位闊度會自動改變。"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "預設會進行排序的欄位"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "順序或反序排列"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔名欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯示此欄"
+"位"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔案大小欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯示"
+"此欄位"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔案擁有者欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯"
+"示此欄位"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔案羣組欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯示"
+"此欄位"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔案日期欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯示"
+"此欄位"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs 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 則不顯示此欄位"
+msgstr ""
+"檔案清單中的檔案屬性欄位闊度,設為 0 表示欄位闊度會自動改變,設為 -1 則不顯示"
+"此欄位"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "代表送出至伺服器的指令的顏色"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "代表從伺服器接收到的指令的顏色"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "代表錯誤訊息的顏色"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "代表其它記錄訊息的顏色"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "本機"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "書籤"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "檔案傳送速度會被控制於每秒 %.2f KB 之內\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "設定 LC_TIME 至 '%s' 時發生錯誤,跌回至 '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "正在從快取記憶載入目錄清單 %s (LC_TIME = %s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "正在從伺服器載入目錄清單 %s (LC_TIME = %s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
-msgstr "警告:正在撤銷檔案 %s 的路徑,已撤銷的路徑 (%s) 和當前的目錄 (%s) 不相符\n"
+msgstr ""
+"警告:正在撤銷檔案 %s 的路徑,已撤銷的路徑 (%s) 和當前的目錄 (%s) 不相符\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "錯誤:無法寫入快取記憶:%s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "錯誤:找不到書籤 %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "書籤錯誤:書籤項目 %s 缺少了主機名稱\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "當前不支援協定 '%s'。\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "發現遞迴的符號鏈結 %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "錯誤:遠端站臺 %s 中斷連線,已達最大連線次數…放棄連線\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "錯誤:無法把執行旗標 %s 設為關閉\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "無法開啟主要的所有權 %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "無法產生 socket pair:%s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "錯誤:無法執行 ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "無法衍生另一個進程:%s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "代理伺服器主機名稱:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "防火牆主機名稱"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "代理伺服器連接埠:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "防火牆的連接埠"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "代理伺服器用戶名稱:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "防火牆用戶名稱"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "代理伺服器密碼:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "防火牆密碼"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "使用 HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -859,83 +880,83 @@ msgstr ""
 "已從伺服器接收到錯誤的回應,中斷連線中\n"
 "從遠端伺服器回傳了無效的區塊(chunk)大小 '%s'\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "在偏移點處開始檔案傳輸"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "無法接收檔案 %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "正在讀取目錄清單…\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "收到錯誤的伺服器回應,正中斷連線\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE 指令"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "帳號 主機"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "帳號 主機:埠號"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "認證"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "帳號 主機 埠號"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "帳號 主機 NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP 代理伺服器"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "自選"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "電郵地址:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "當以匿名方式登入至遠端 FTP 伺服器時會使用本密碼"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "代理伺服器帳號:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "防火牆帳號 (並非必要)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "代理伺服器類型:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -945,7 +966,8 @@ msgid ""
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
 msgstr ""
-"指定如何登入代理伺服器。其中,一些特殊資料可透過 % 加兩個字母表示。第一個字母可以是:\n"
+"指定如何登入代理伺服器。其中,一些特殊資料可透過 % 加兩個字母表示。第一個字母"
+"可以是:\n"
 "    p: 代理伺服器\n"
 "    h: FTP 伺服器主機\n"
 "第二個字母可以是:\n"
@@ -956,23 +978,26 @@ msgstr ""
 "    a: 帳號\n"
 "舉個例子,指定代理伺服器用戶可以用 %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "忽略 PASV 位址"
 
-#: ../lib/rfc959.c:72
+#: 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 "如選用本選項,遠端 FTP 伺服器的 PASV IP 位址之欄位會被忽略,並且會使用主機的 IP 位址來取代之。在 PASV 回覆的情況下,這是時常需要路由器給予它們內部的 IP 位址多過外在的 IP 
位址。"
+msgstr ""
+"如選用本選項,遠端 FTP 伺服器的 PASV IP 位址之欄位會被忽略,並且會使用主機的 "
+"IP 位址來取代之。在 PASV 回覆的情況下,這是時常需要路由器給予它們內部的 IP 位"
+"址多過外在的 IP 位址。"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "被動 (PASV) 方式傳送檔案"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -980,398 +1005,400 @@ msgid ""
 "to an older FTP server that doesn't support this. If this is disabled, then "
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
-msgstr "如選用本選項,遠端的 FTP 伺服器會開啟連接埠來進行資料傳送。如果你的主機或網絡受到防火牆保護,則應啟用本選項。一般來說,除非是需要連接一些舊式、不支援這種協定的 FTP 
伺服器,否則最好還是使用這個選項。如果關閉本選項,gFTP 會在客戶端開啟連接埠,讓遠端伺服器嘗試主動進行連線。"
+msgstr ""
+"如選用本選項,遠端的 FTP 伺服器會開啟連接埠來進行資料傳送。如果你的主機或網絡"
+"受到防火牆保護,則應啟用本選項。一般來說,除非是需要連接一些舊式、不支援這種"
+"協定的 FTP 伺服器,否則最好還是使用這個選項。如果關閉本選項,gFTP 會在客戶端"
+"開啟連接埠,讓遠端伺服器嘗試主動進行連線。"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "解析遠端符號鏈結 (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
-msgstr "遠端的伺服器會嘗試在列出目錄時解析符號鏈結。一般來說,最好是選用這個選項。唯一應該關閉選項的情況是遠端 FTP 伺服器中的 LIST 指令不支援 -L 選項"
+msgstr ""
+"遠端的伺服器會嘗試在列出目錄時解析符號鏈結。一般來說,最好是選用這個選項。唯"
+"一應該關閉選項的情況是遠端 FTP 伺服器中的 LIST 指令不支援 -L 選項"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "以 ASCII 模式傳送檔案"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
 "If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
 "text files. If you are transferring from UNIX to UNIX, then it is safe to "
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
-msgstr "如果你是從 Windows 傳送文字檔至 UNIX 或從 UNIX 傳送文字檔至 Windows,應該選用本選項。兩種系統的文字檔使用不同的方式來表示換列。如果是從 UNIX 傳送至 
UNIX,則不需要選用本選項。如果是下載二元碼檔案,則必須關閉本選項。"
+msgstr ""
+"如果你是從 Windows 傳送文字檔至 UNIX 或從 UNIX 傳送文字檔至 Windows,應該選用"
+"本選項。兩種系統的文字檔使用不同的方式來表示換列。如果是從 UNIX 傳送至 UNIX,"
+"則不需要選用本選項。如果是下載二元碼檔案,則必須關閉本選項。"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "無法產生 IPv4 socket:%s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: 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:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "無法建立數據連線:%s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "無法讀取 socket 名稱:%s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "無法開啟連接埠:%s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "無法產生 IPv6 socket:%s\n"
 
-#: ../lib/rfc959.c:895
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "無效的 EPSV 回應‘%s’\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "無法獲取 local socket 的地址:%s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "無法接受伺服器的連線要求:%s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "總數"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "無法產生 socket:%s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: 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
+#: 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
+#: 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
+#: 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 的網絡服務,請檢查 services 檔案的內容\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "無法讀取 socket 的旗標:%s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "無法將 socket 設定為 non-blocking 模式:%s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH 程式名稱:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH 可執行檔的路徑"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH 額外參數:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH 程式使用的額外參數"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "需要 SSH 用戶名稱/密碼"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH 連線需要用戶名稱/密碼"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "正在執行程式 %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "請輸入 RSA 密碼匙的密碼詞組"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "請輸入密碼匙的密碼詞組"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "密碼:"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "密碼:"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(是/否)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "輸入密碼:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "輸入 SecurID 密碼:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "錯誤:輸入了錯誤的密碼\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d:初始化協定\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d:協定版本 %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d:開啟 %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d:關閉\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d:開啟目錄 %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d:讀取目錄內容\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d:移除檔案 %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d:新增目錄 %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d:移除目錄 %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d:Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d:檔案屬性\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d:Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d:%s 權限更改為 %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d:Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "確定"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "檔案終結"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "檔案或目錄不存在"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "失敗"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "訊息錯誤"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "沒有連線"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "連線中斷"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "不支援此項操作程序"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "伺服器回傳了不明的訊息"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "錯誤:訊息長度 %d 過長\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 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"
+msgstr ""
+"在初始化一個和遠端伺服器的 SSH 連線時出現錯誤,以下的便是從遠端伺服器傳來的錯"
+"誤信息:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "正在開啟連至 %s 的 SSH 連線\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "成功登入 SSH 伺服器 %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL 引擎"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy 檔案:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropy 檔案"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy 種子的長度:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL 引擎播種的最大位元組數目"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "檢查 SSL 共享連線"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1384,63 +1411,67 @@ msgstr ""
 "主題 = %s\n"
 "錯誤 %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "無法取得共享連線的認證\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
 "connected to (%s). Aborting connection.\n"
-msgstr "錯誤:在 SSL 認證 (%s) 裏的主機和我們已連接了的主機 (%s) 不相符,正中斷連線。\n"
+msgstr ""
+"錯誤:在 SSL 認證 (%s) 裏的主機和我們已連接了的主機 (%s) 不相符,正中斷連"
+"線。\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "無法初始化 OpenSSL 程式庫\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "在載入預設的 SSL 認證時發生錯誤\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "在設定暗號清單時發生錯誤(沒有有效的暗號)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "錯誤:SSL 引擎沒有被初始化\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "在設定 SSL 連線時發生錯誤(BIO物件)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "在設定 SSL 連線時發生錯誤(SSL物件)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "共享連線之認證出現錯誤:%s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "操作已取消\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "等待 %d 秒後重試連線直至成功\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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"
+msgstr ""
+"gFTP 絕對不附任何保證;詳見檔案 COPYING。這是自由軟件,可在特定的條件下散布;"
+"詳見檔案 COPYING。\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "如對翻譯有任何意見,請送一封電子郵件給\n"
@@ -1451,69 +1482,69 @@ msgstr ""
 "Abel Cheung <abel oaka org>, 2002-03\n"
 "Fang Chun-Chih <ccfang1 ms21 hinet net>, 1999"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "用法:chmod <模式> <檔案>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "用法:rename <舊檔名> <新檔名>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "用法:delete <檔案>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "用法:rmdir <目錄>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "用法: site <站臺指令>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "用法:mkdir <新目錄>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "用法:chdir <目錄>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "無效的參數\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "清除目錄清單暫存記憶\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "用法: open"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "用法:set [變數 = 變數值]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "錯誤:變數 %s 不是有效的組態變數。\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "錯誤:gFTP 文字模式版本中無法使用 %s 變數\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1521,320 +1552,319 @@ msgstr ""
 "支援的指令:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "用法: %s <檔案清單>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "顯示有關 gFTP 的資訊"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "將目前的檔案傳送模式更改為文字模式 (只有 FTP 適用)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "二進位檔"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "將目前的檔案傳送模式更改為二進位模式 (只有 FTP 適用)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "進入其它遠端目錄"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "在遠端主機更改檔案的權限"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "可選用的選項:cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "中止和遠端站臺的連線"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "移除遠端主機中的檔案"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "顯示遠端主機目前的目錄及檔案清單"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "下載遠端的檔案"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "顯示本求助訊息畫面"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "進入本地主機中的其它目錄"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "更改本地主機的檔案權限"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "移除本地主機的檔案"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "顯示本地主機目前的目錄及檔案清單"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "在本地主機新增目錄"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "顯示本地主機目前的目錄"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "更改本地主機的檔案名稱"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "移除本地主機的目錄"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "在遠端主機建立目錄"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "上傳本機檔案"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "連線至遠端站臺"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "顯示目前的遠端目錄"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "離開 gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "將遠端檔案重新命名"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "移除一個遠端目錄"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "顯示組態檔中的變數。你也可以透過 set var=val 的方式來設定變數。"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "站臺"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "輸入站臺的特定指令"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "錯誤:無法辨認指令\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "成功傳送 %s,速度為每秒 %.2f KB\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "略過檔案 %s (主機為 %s)\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "停止主機 %s 的檔案傳送\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "無法下載 %s (從 %s)\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr "有 %d 個無法傳送的檔案或目錄。請檢查記錄看看哪些項目未被正確傳送。"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s:進行其它操作程序前,必須先按停止按鈕\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "執行書籤"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "新增書籤:必須輸入書籤名稱\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "新增書籤:書籤 %s 已存在,無法新增書籤\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "新增書籤"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "新增書籤:必須輸入主機名稱\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1844,137 +1874,130 @@ msgstr ""
 "你可以將書籤放進副選單,以 / 分隔即可\n"
 "(例如 Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "記錄密碼"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "你必須輸入書籤名稱。"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "新資料夾"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "請輸入欲新增的資料夾名稱"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "新項目"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "請輸入欲新增的項目名稱"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 msgstr "確定要刪除書籤 %s 及以下的所有書籤嗎?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "刪除書籤"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "修改項目"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "說明:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "主機名稱:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "埠號:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "協定:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "遠端目錄:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "本機目錄:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "用戶名稱:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "帳號:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "匿名登入"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "取消"
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/檔案/撕下"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/檔案/新資料夾(_F)…"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/檔案/新項目(_I)…"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/檔案/刪除(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/檔案/屬性(_P)…"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/檔案/分隔線"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/檔案/關閉(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "修改書籤"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "更改檔案權限"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -1982,91 +2005,90 @@ msgstr ""
 "現在你可以更改檔案屬性\n"
 "注意:並非所有 FTP 伺服器都可以更改檔案權限"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "特殊"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "相關的"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "使用者"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "讀取"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "寫入"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "執行"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "羣組"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "其它"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "是否確定刪除以下 %ld 個檔案和 %ld 個目錄"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "你確定要刪除那 %ld 個檔案嗎?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "你確定要刪除那 %ld 個目錄嗎?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "刪除檔案/目錄"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "連線"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "已下載 URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "拖放"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "離開"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2074,468 +2096,455 @@ msgstr ""
 "尚有檔案仍在傳送中。\n"
 "確定要離開嗎?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "開啟位置"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "輸入一個要連接的 URL"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/撕下"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/視窗 _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/視窗 _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/純文字檔(_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/二進位檔(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/檔案/屬性(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/離開(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/本機(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/本機/撕下"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/本機/開啟位置(_O)…"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/本機/中斷連線(_I)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/本機/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/本機/篩選檔案清單(_F)…"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/本機/顯示選取項目(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/本機/全選(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/本機/選取所有檔案"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/本機/全部不選"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/本機/儲存目錄清單…"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/本機/傳送 SITE 指令…"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/本機/前往其它目錄(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/本機/更改權限(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/檔案/新資料夾(_N)…"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/本機/更改檔名(_M)…"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/本機/刪除(_D)…"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/本機/編輯(_E)…"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/本機/檢視(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/本機/更新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/遠端(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/遠端/撕下"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/遠端/開啟位置(_O)…"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/遠端/中斷連線(_I)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/遠端/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/遠端/篩選檔案清單(_F)…"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/遠端/顯示選取項目(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/遠端/全選(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/遠端/選取所有檔案"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/遠端/全部不選"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/遠端/儲存目錄清單…"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/遠端/傳送 SITE 指令…"
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/遠端/前往其它目錄(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/遠端/更改權限(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/檔案/新資料夾(_N)…"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/遠端/更改檔名(_M)…"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/遠端/刪除(_D)…"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/遠端/編輯(_E)…"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/遠端/查看(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/遠端/更新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/書籤(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/書籤/撕下"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/書籤/新增書籤(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/書籤/修改書籤"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/書籤/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/傳送(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/傳送/撕下"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/傳送/開始(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/傳送/停止(_O)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/傳送/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/傳送/略過當前的檔案(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/傳送/移除檔案(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/傳送/將檔案上移(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/傳送/將檔案下移(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/傳送/下載檔案(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/傳送/上傳檔案(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/記錄(_O)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/記錄/撕下"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/記錄/清除(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/本機/檢視(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/記錄/儲存(_S)…"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/工具(_S)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/工具/撕下"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/工具/比較兩邊視窗(_O)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/工具/清除暫存快取(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/求助(_H)"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/求助/撕下"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/求助/關於(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "主機:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "主機(_H):"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "埠:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "用戶:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "使用者(_U):"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "密碼:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "指令:"
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "檔名"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "檔案大小"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "日期"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "屬性"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "進度"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "錯誤:必須輸入準備連上的主機名稱\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "更新"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "輸入使用者名稱"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "請輸入你在這個站臺的使用者名稱"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "請輸入你在這個站臺的密碼"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "操作取消…你必須輸入一個字串\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "新增目錄"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "新增目錄"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "輸入準備新增的目錄名稱"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "你想把 %s 更改為甚麼名稱呢?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "站臺"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "輸入站臺的特定指令"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "先前站臺待定的"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "前往其它目錄"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "續傳"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "略過"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "行動"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "傳送檔案"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2543,70 +2552,70 @@ msgstr ""
 "下列檔案在本地及遠端的主機都存在\n"
 "請決定處理方法"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "略過檔案"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "全選"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "全部不選"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "篩選檔案清單:操作取消…必須輸入字串\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "篩選檔案清單"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "錯誤:無法開啟 %s 寫入資料:%s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "儲存目錄清單"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "錯誤:寫入 %s 時發生錯誤:%s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "成功將日誌檔案寫入 %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "儲存日誌"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "找不到使用條款檔案 COPYING。請確定它在 %s 或 %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "關於 gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2618,98 +2627,80 @@ msgstr ""
 "官方網頁:http://www.gftp.org/\n";
 "標誌作者:Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "關於"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "使用條款"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  關閉  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "比較視窗"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "中止和遠端伺服器的連線"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
-msgstr "正在連線到在主機輸入欄位指定了的站臺。如果主機輸入欄位是空白的話,會出現一個對話盒,它會容許你輸入一個 URL。"
+msgstr ""
+"正在連線到在主機輸入欄位指定了的站臺。如果主機輸入欄位是空白的話,會出現一個"
+"對話盒,它會容許你輸入一個 URL。"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (在暫存記憶內) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "尚未連線"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "開啟檔案 %s 發生錯誤:%s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s:尚未連線至遠端站臺\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s:使用此種協定時,本項功能無效\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s:只能選擇一個項目\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s:至少必須選擇一個項目\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "更改"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "新增"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  是  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  否  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "正在擷取目錄清單"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  停止  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2718,109 +2709,89 @@ msgstr ""
 "已下載 %ld 個目錄\n"
 "及 %ld 個檔案"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP 錯誤:在 %2$s 或 %3$s 找不到 %1$s 檔案\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "修改主機名稱"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "新增主機"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "類型:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "類型(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "網域名稱"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "網絡位址"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "網絡位址(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "網絡遮罩"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "網絡遮罩(_E):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "網域名稱(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "網絡遮罩"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "本地主機"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "編輯"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "選項"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "套用"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "正在接收檔名…"
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "連線中…"
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "擷取檔案:尚未連上遠端站臺\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "錯誤:副進程 %d 回傳值為 %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "副進程 %d 成功執行\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "錯誤:副進程 %d 沒有正常的結束\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "錯誤:無法獲取檔案 %s 的資訊:%s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "檔案 %s 沒有任何更改\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2829,108 +2800,113 @@ msgstr ""
 "檔案 %s 已經更改了。\n"
 "要把它上傳嗎?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "編輯檔案"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "完成"
 
-#: ../src/gtk/transfer.c:734
+#: 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,預計 %02d:%02d:%02d 後結束"
+msgstr ""
+"已傳送 %s 位元組 (總共 %s),速度為每秒 %.2fKB,預計 %02d:%02d:%02d 後結束"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "已傳送 %s 位元組 (總共 %s),速度為每秒 %.2fKB,預計 %02d:%02d:%02d 後結束"
+msgstr ""
+"已傳送 %s 位元組 (總共 %s),速度為每秒 %.2fKB,預計 %02d:%02d:%02d 後結束"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "已傳送 %s 位元組 (總共 %s),傳送延誤,無法估計時間"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "已傳送 %s 位元組 (總共 %s),傳送延誤,無法估計時間"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "不明的百份比已完成。(第 %ld 個檔案,共 %ld 個檔案)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 後結束。(第 %ld 個檔案,共 %ld 個)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "正在讀取檔名…%s 位元組"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "查看"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "編輯"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "查看:無法衍生另一個程序:%s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "正在執行程式:%s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "開啟 %s (使用 %s)\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "正在查看檔案 %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "查看:無法開啟檔案 %s:%s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "無法開啟控制終端機 %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "使用者名稱 [匿名]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -2939,3 +2915,39 @@ msgid ""
 msgstr ""
 "%s 已經存在。(原始檔的大小:%s,目的檔的大小:%s):\n"
 "覆寫(o),續傳(r),略過(s),全部覆寫(O),全部續傳(R),全部略過(S):(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "取消"
+
+#~ msgid "Host: "
+#~ msgstr "主機:"
+
+#~ msgid "User: "
+#~ msgstr "用戶:"
+
+#~ msgid "  Close  "
+#~ msgstr "  關閉  "
+
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "  Yes  "
+#~ msgstr "  是  "
+
+#~ msgid "  No  "
+#~ msgstr "  否  "
+
+#~ msgid "Type:"
+#~ msgstr "類型:"
+
+#~ msgid "Network Address"
+#~ msgstr "網絡位址"
+
+#~ msgid "_Edit"
+#~ msgstr "編輯(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "套用"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 04e8e0f..a3972f2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,98 +9,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp 2.0.19\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gftp&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-20 12:04+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gftp\n";
+"POT-Creation-Date: 2013-09-30 00:36+0100\n"
 "PO-Revision-Date: 2012-09-21 12:30+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun gmail com>\n"
 "Language-Team: Chinese (Taiwan) <community linuxhall org>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/bookmark.c:38
+#: lib/bookmark.c:38
 #, c-format
 msgid "Invalid URL %s\n"
 msgstr "URL %s 無效\n"
 
-#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
+#: lib/cache.c:50 lib/cache.c:64 lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "錯誤:快取記憶索引檔中的這一列無效:%s\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
+#: 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"
 
-#: ../lib/cache.c:164
+#: lib/cache.c:164
 #, c-format
 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:272
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
+#: 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: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:184
-#: ../lib/local.c:193 ../lib/local.c:247
+#: 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/charset-conv.c:73
+#: lib/charset-conv.c:71
 #, c-format
 msgid ""
 "Error converting string '%s' from character set %s to character set %s: %s\n"
 msgstr "在轉換字串‘%s’裡的字元集 %s 到另一種字元集 %s: %s 時發生錯誤\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:1625
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "錯誤:無法開啟本地主機檔案 %s:%s\n"
 
-#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
+#: lib/config_file.c:143 lib/sockutils.c:293 lib/sslcommon.c:488
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "錯誤:無法寫入 socket:%s\n"
 
-#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:446
+#: lib/config_file.c:151 lib/sockutils.c:214 lib/sshv2.c:445
+#: lib/sslcommon.c:441
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "錯誤:無法讀取 socket:%s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:737
+#: 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"
 
-#: ../lib/config_file.c:192
+#: lib/config_file.c:192
 #, c-format
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "警告:找不到主書籤檔 %s\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:743
+#: 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"
 
-#: ../lib/config_file.c:295 ../lib/config_file.c:317
+#: lib/config_file.c:295 lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP 警告:略過書籤檔第 %d 列:%s\n"
 
-#: ../lib/config_file.c:347
+#: lib/config_file.c:347
 #, c-format
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP 警告:第 %d 列參數不足\n"
 
-#: ../lib/config_file.c:504
+#: 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 "
@@ -109,7 +107,7 @@ msgstr ""
 "這裡可列出屬於本地網域,不需連上代理伺服器 (若適用) 的主機。\n"
 "語法:dont_use_proxy=.domain 或 dont_use_proxy=network_number/netmask"
 
-#: ../lib/config_file.c:507
+#: 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"
@@ -117,52 +115,52 @@ msgstr ""
 "ext=延伸檔名:XPM 檔案:純文字/二進位模式(A 或 B):檢視程式\n"
 "註:延伸檔名以外的其它欄位都可以不填"
 
-#: ../lib/config_file.c:587 ../lib/config_file.c:832
+#: 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:598
+#: 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:608
+#: 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:610
+#: lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "您有執行 make install 嗎?\n"
 
-#: ../lib/config_file.c:619 ../lib/config_file.c:838
+#: 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:658
+#: 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:664
+#: 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:671
+#: lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP 錯誤:錯誤的記錄檔名稱 %s\n"
 
-#: ../lib/config_file.c:677
+#: 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:732
+#: 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"
@@ -170,7 +168,7 @@ msgstr ""
 "gFTP 書籤檔。 版權所有 ©1998-2007 Brian Masney <masneyb gftp org>。 警告:任"
 "何加入此檔案的變更都會被覆寫。"
 
-#: ../lib/config_file.c:733
+#: 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 "
@@ -181,7 +179,7 @@ msgstr ""
 "止當您在編輯這個檔案時,您的密碼會被某人看到和容易的記得到。在這之前,所有密"
 "碼均以純文字格式來儲存。"
 
-#: ../lib/config_file.c:845
+#: 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. "
@@ -191,244 +189,241 @@ msgstr ""
 "何加入此檔案的變更都會被覆寫。 若某項目含有 (*),表示該項目無法在 gFTP 中變"
 "更。"
 
-#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
-#: ../lib/rfc2068.c:544
-#, c-format
+#: lib/config_file.c:1209 lib/protocols.c:383 lib/rfc2068.c:543
+#: lib/rfc2068.c:544
 msgid "<unknown>"
 msgstr "<不明>"
 
-#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
+#: 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"
 
-#: ../lib/fsp.c:189
+#: lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "錯誤:無法上傅檔案 %s\n"
 
-#: ../lib/fsp.c:199
+#: lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "錯誤:無法寫入至檔案 %s: %s\n"
 
-#: ../lib/fsp.c:237
+#: lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "錯誤: 關閉檔案%s時發生錯誤\n"
 
-#: ../lib/fsp.c:327
+#: lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
 msgstr "來自FSP伺服器 %s 的損壞檔案清單\n"
 
-#: ../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
+#: 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 "不明"
 
-#: ../lib/fsp.c:377
+#: lib/fsp.c:377
 #, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "無法取得FSP目錄清單 %s:%s\n"
 
-#: ../lib/fsp.c:436
+#: lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "成功變更目錄至 %s\n"
 
-#: ../lib/fsp.c:446
+#: lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "無法變更目錄至 %s\n"
 
-#: ../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
+#: 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:304
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "成功移除 %s\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:486
+#: 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:522 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:310
+#: lib/fsp.c:506 lib/local.c:522 src/gtk/transfer.c:267
+#: src/gtk/view_dialog.c:308
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "錯誤:無法移除檔案 %s:%s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:554
+#: 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:590
+#: 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:597
+#: 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:156
+#: lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 "因為支援SSL的程式碼沒有被編譯在內,故此無法提供FTPS的支援,正中斷連線。\n"
 
-#: ../lib/https.c:91
+#: lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
 "因為支援SSL的程式碼沒有被編譯在內,故此無法提供HTTPS的支援,正中斷連線。\n"
 
-#: ../lib/local.c:66
+#: lib/local.c:66
 #, c-format
 msgid "Could not get current working directory: %s\n"
 msgstr "無法取得當前工作中的目錄:%s\n"
 
-#: ../lib/local.c:105
+#: lib/local.c:105
 #, c-format
 msgid "Successfully changed local directory to %s\n"
 msgstr "成功變更本地主機目錄至 %s\n"
 
-#: ../lib/local.c:112
+#: lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "無法變更本地主機目錄至 %s: %s\n"
 
-#: ../lib/local.c:238
+#: lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "錯誤:無法截斷本地主機檔案 %s: %s\n"
 
-#: ../lib/local.c:424
+#: lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "無法取得本地主機目錄的清單 %s:%s\n"
 
-#: ../lib/local.c:634
+#: lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "成功變更模式 %s 為 %o\n"
 
-#: ../lib/local.c:641
+#: lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "錯誤:無法變更模式 %s 為 %o:%s\n"
 
-#: ../lib/local.c:676
+#: lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
 msgstr "成功變更 %s 的時間戳記\n"
 
-#: ../lib/local.c:683
+#: lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
 msgstr "錯誤:無法變更 %s: %s 的時間戳記\n"
 
-#: ../lib/local.c:750
+#: lib/local.c:750
 msgid "local filesystem"
 msgstr "本機檔案系統"
 
-#: ../lib/misc.c:414
+#: lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "用法︰ gftp"
 
-#. @null@
-#: ../lib/options.h:25 ../lib/rfc959.c:26
+#: lib/options.h:25 lib/rfc959.c:26
 msgid "none"
 msgstr "無"
 
-#: ../lib/options.h:25
+#: lib/options.h:25
 msgid "file"
 msgstr "檔案"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "size"
 msgstr "大小"
 
-#: ../lib/options.h:26
+#: lib/options.h:26
 msgid "user"
 msgstr "使用者"
 
-#: ../lib/options.h:27
+#: lib/options.h:27
 msgid "group"
 msgstr "群組"
 
-#: ../lib/options.h:28
+#: lib/options.h:28
 msgid "datetime"
 msgstr "時間"
 
-#: ../lib/options.h:29
+#: lib/options.h:29
 msgid "attribs"
 msgstr "屬性"
 
-#. @null@
-#: ../lib/options.h:32
+#: lib/options.h:32
 msgid "descending"
 msgstr "遞減"
 
-#: ../lib/options.h:33
+#: lib/options.h:33
 msgid "ascending"
 msgstr "遞增"
 
-#: ../lib/options.h:40
+#: lib/options.h:40
 msgid "General"
 msgstr "一般"
 
-#: ../lib/options.h:43
+#: lib/options.h:43
 msgid "View program:"
 msgstr "檢視程式:"
 
-#: ../lib/options.h:44
+#: 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
+#: lib/options.h:46
 msgid "Edit program:"
 msgstr "編輯程式:"
 
-#: ../lib/options.h:47
+#: lib/options.h:47
 msgid "The default program used to edit files."
 msgstr "預設用來編輯檔案的程式。"
 
-#: ../lib/options.h:48
+#: lib/options.h:48
 msgid "Max Log Window Size:"
 msgstr "日誌視窗最大記憶量:"
 
-#: ../lib/options.h:50
+#: lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "在 GTK+ 版本中,日誌視窗佔用的記憶體最大值 (位元組)"
 
-#: ../lib/options.h:52
+#: lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "遠端字元集:"
 
-#: ../lib/options.h:54
+#: lib/options.h:54
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
 msgstr "這是一個用逗號分隔開的字元集清單,並且嘗試把遠端的信息轉換成當前的語系"
 
-#: ../lib/options.h:56
+#: lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "遠端的 LC_TIME:"
 
-#: ../lib/options.h:58
+#: lib/options.h:58
 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."
@@ -436,221 +431,221 @@ msgstr ""
 "這是一個為遠端站臺而設的遠端 LC_TIME 之數值,所以所有日期能夠正確地分列在目錄"
 "清單裡。"
 
-#: ../lib/options.h:60
+#: lib/options.h:60
 msgid "Cache TTL:"
 msgstr "快取記憶之總量︰"
 
-#: ../lib/options.h:63
+#: lib/options.h:63
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "在那些快取記憶裡之記錄到期前,保存它們的秒數。"
 
-#: ../lib/options.h:66
+#: lib/options.h:66
 msgid "Append file transfers"
 msgstr "傳送時附加至現有的檔案"
 
-#: ../lib/options.h:68
+#: lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "傳送新的檔案時將資料附加至現有的檔案末端"
 
-#: ../lib/options.h:69
+#: lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "每次只傳送一個檔案"
 
-#: ../lib/options.h:71
+#: lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "每次是否只傳送一個檔案?"
 
-#: ../lib/options.h:72
+#: lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "預設為覆寫檔案"
 
-#: ../lib/options.h:75
+#: lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "預設為覆寫檔案或續傳檔案"
 
-#: ../lib/options.h:77
+#: lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "保留檔案權限"
 
-#: ../lib/options.h:80
+#: lib/options.h:80
 msgid "Preserve file permissions of transferred files"
 msgstr "保留被傳送檔案的檔案權限"
 
-#: ../lib/options.h:82
+#: lib/options.h:82
 msgid "Preserve file time"
 msgstr "保留檔案時間"
 
-#: ../lib/options.h:85
+#: lib/options.h:85
 msgid "Preserve file times of transferred files"
 msgstr "保留被傳送檔案的檔案時間"
 
-#: ../lib/options.h:87
+#: lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "每次檔案傳送後更新畫面"
 
-#: ../lib/options.h:90
+#: lib/options.h:90
 msgid "Refresh the listbox after each file is transferred"
 msgstr "每次檔案傳送後更新檔案清單"
 
-#: ../lib/options.h:92
+#: lib/options.h:92
 msgid "Sort directories first"
 msgstr "先排列目錄"
 
-#: ../lib/options.h:95
+#: lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "先排列目錄,再排列檔案"
 
-#: ../lib/options.h:96
+#: lib/options.h:96
 msgid "Show hidden files"
 msgstr "顯示隱藏檔案"
 
-#: ../lib/options.h:99
+#: lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "在檔案清單中顯示隱藏檔案"
 
-#: ../lib/options.h:100
+#: lib/options.h:100
 msgid "Show transfer status in title"
 msgstr "以標題形式顯示傳送狀態"
 
-#: ../lib/options.h:102
+#: lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
 msgstr "在標題列裡顯示檔案傳送狀態"
 
-#: ../lib/options.h:103
+#: lib/options.h:103
 msgid "Start file transfers"
 msgstr "開始檔案傳送"
 
-#: ../lib/options.h:105
+#: lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "當輪到您時檔案傳送會自動開始"
 
-#: ../lib/options.h:107
+#: lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "容許在GUI裡手動輸入指令"
 
-#: ../lib/options.h:109
+#: lib/options.h:109
 msgid ""
 "Allow entering manual commands in the GUI (functions like the text port)"
 msgstr "容許在 GUI 裡手動輸入指令(類似文字埠的功能)"
 
-#: ../lib/options.h:111
+#: lib/options.h:111
 msgid "Remember last directory"
 msgstr "記住上次使用的目錄"
 
-#: ../lib/options.h:113
+#: lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
 msgstr "關閉應用軟體時,儲存上次使用的本地與遠端目錄"
 
-#: ../lib/options.h:115
+#: lib/options.h:115
 msgid "Connect to remote server on startup"
 msgstr "啟動時與遠端伺服器連線"
 
-#: ../lib/options.h:117
+#: lib/options.h:117
 msgid ""
 "Automatically connect to the remote server when the application is started."
 msgstr "當應用軟體啟動時,自動與遠端伺服器連線"
 
-#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
-#: ../src/gtk/options_dialog.c:1240
+#: lib/options.h:120 src/gtk/options_dialog.c:954
+#: src/gtk/options_dialog.c:1132
 msgid "Network"
 msgstr "網路"
 
-#: ../lib/options.h:122
+#: lib/options.h:122
 msgid "Network timeout:"
 msgstr "連線時限:"
 
-#: ../lib/options.h:125
+#: lib/options.h:125
 msgid ""
 "The timeout waiting for network input/output. This is NOT an idle timeout."
 msgstr "等待網路輸入/輸出的時限。此項設定不同於連線後的閒置時間。"
 
-#: ../lib/options.h:127
+#: lib/options.h:127
 msgid "Connect retries:"
 msgstr "連線重試次數:"
 
-#: ../lib/options.h:130
+#: lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "自動重試次數,設為 0 表示會不斷重試"
 
-#: ../lib/options.h:132
+#: lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "重試前的等待時間:"
 
-#: ../lib/options.h:135
+#: lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "每次重試前等待指定秒數"
 
-#: ../lib/options.h:136
+#: lib/options.h:136
 msgid "Max KB/S:"
 msgstr "最大傳送速度(KB/S):"
 
-#: ../lib/options.h:139
+#: lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "檔案傳送最大速度 (KB/S)。(設為 0 會關閉此功能)"
 
-#: ../lib/options.h:141
+#: lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "傳送的數據塊大小:"
 
-#: ../lib/options.h:144
+#: lib/options.h:144
 msgid ""
 "The block size that is used when transferring files. This should be a "
 "multiple of 1024."
 msgstr "在傳送檔案時是以數據塊大小做為單位,其數值應該是 1024 的倍數。"
 
-#: ../lib/options.h:147
+#: lib/options.h:147
 msgid "Default Protocol:"
 msgstr "預設協定:"
 
-#: ../lib/options.h:149
+#: lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "指定預設使用的協定"
 
-#: ../lib/options.h:151 ../lib/options.h:154
+#: lib/options.h:151 lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "啟動 IPv6 的支援"
 
-#: ../lib/options.h:159
+#: lib/options.h:159
 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=傳送檔案"
 
-#: ../lib/options.h:162
+#: lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "本地主機檔案清單的預設寬度"
 
-#: ../lib/options.h:165
+#: lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "遠端主機檔案清單的預設寬度"
 
-#: ../lib/options.h:168
+#: lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "本地或遠端主機檔案清單的預設高度"
 
-#: ../lib/options.h:171
+#: lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "檔案傳送清單的預設高度"
 
-#: ../lib/options.h:174
+#: lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "日誌視窗的預設高度"
 
-#: ../lib/options.h:177
+#: 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 表示欄位寬度會自動改變。"
 
-#: ../lib/options.h:190 ../lib/options.h:196
+#: lib/options.h:190 lib/options.h:196
 msgid "The default column to sort by"
 msgstr "預設會進行排序的欄位"
 
-#: ../lib/options.h:193 ../lib/options.h:199
+#: lib/options.h:193 lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "順序或反序排列"
 
-#: ../lib/options.h:203 ../lib/options.h:221
+#: lib/options.h:203 lib/options.h:221
 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"
@@ -658,7 +653,7 @@ msgstr ""
 "檔案清單中的檔名欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯示此欄"
 "位"
 
-#: ../lib/options.h:206 ../lib/options.h:224
+#: lib/options.h:206 lib/options.h:224
 msgid ""
 "The width of the size column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -666,7 +661,7 @@ msgstr ""
 "檔案清單中的檔案大小欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯示"
 "此欄位"
 
-#: ../lib/options.h:209 ../lib/options.h:227
+#: lib/options.h:209 lib/options.h:227
 msgid ""
 "The width of the user column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -674,7 +669,7 @@ msgstr ""
 "檔案清單中的檔案擁有者欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯"
 "示此欄位"
 
-#: ../lib/options.h:212 ../lib/options.h:230
+#: lib/options.h:212 lib/options.h:230
 msgid ""
 "The width of the group column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -682,7 +677,7 @@ msgstr ""
 "檔案清單中的檔案群組欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯示"
 "此欄位"
 
-#: ../lib/options.h:215 ../lib/options.h:233
+#: lib/options.h:215 lib/options.h:233
 msgid ""
 "The width of the date column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -690,7 +685,7 @@ msgstr ""
 "檔案清單中的檔案日期欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯示"
 "此欄位"
 
-#: ../lib/options.h:218 ../lib/options.h:236
+#: lib/options.h:218 lib/options.h:236
 msgid ""
 "The width of the attribs column in the file listboxes. Set this to 0 to have "
 "this column automagically resize. Set this to -1 to disable this column"
@@ -698,75 +693,75 @@ msgstr ""
 "檔案清單中的檔案屬性欄位寬度,設為 0 表示欄位寬度會自動改變,設為 -1 則不顯示"
 "此欄位"
 
-#: ../lib/options.h:239
+#: lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "代表送出至伺服器的指令的顏色"
 
-#: ../lib/options.h:242
+#: lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "代表從伺服器接收到的指令的顏色"
 
-#: ../lib/options.h:245
+#: lib/options.h:245
 msgid "The color of the error messages"
 msgstr "代表錯誤訊息的顏色"
 
-#: ../lib/options.h:248
+#: lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "代表其它記錄訊息的顏色"
 
-#: ../lib/options.h:254 ../lib/rfc959.c:40
+#: lib/options.h:254 lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:257 ../lib/options.h:259
+#: lib/options.h:257 lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:262 ../lib/rfc2068.c:27
+#: lib/options.h:262 lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:265 ../lib/options.h:267
+#: lib/options.h:265 lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:270
+#: lib/options.h:270
 msgid "Local"
 msgstr "本機"
 
-#: ../lib/options.h:272
+#: lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
+#: lib/options.h:274 src/gtk/bookmarks.c:855
 msgid "Bookmark"
 msgstr "書籤"
 
-#: ../lib/options.h:275
+#: lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:228
+#: lib/protocols.c:226
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "檔案傳送速度會被控制於每秒 %.2f KB 之內\n"
 
-#: ../lib/protocols.c:381
+#: lib/protocols.c:379
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "設定 LC_TIME 至 '%s' 時發生錯誤,跌回至 '%s'\n"
 
-#: ../lib/protocols.c:392
+#: lib/protocols.c:390
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "正在從快取記憶載入目錄清單 %s (LC_TIME = %s)\n"
 
-#: ../lib/protocols.c:402
+#: lib/protocols.c:400
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "正在從伺服器載入目錄清單 %s (LC_TIME = %s)\n"
 
-#: ../lib/protocols.c:452
+#: lib/protocols.c:450
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
@@ -774,108 +769,108 @@ msgid ""
 msgstr ""
 "警告:正在撤銷檔案 %s 的路徑,已撤銷的路徑 (%s) 和當前的目錄 (%s) 不相符\n"
 
-#: ../lib/protocols.c:483
+#: lib/protocols.c:481
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "錯誤:無法寫入快取記憶:%s\n"
 
-#: ../lib/protocols.c:516
+#: lib/protocols.c:514
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "錯誤:找不到書籤 %s\n"
 
-#: ../lib/protocols.c:523
+#: lib/protocols.c:521
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "書籤錯誤:書籤項目 %s 缺少了主機名稱\n"
 
-#: ../lib/protocols.c:645 ../lib/protocols.c:672
+#: lib/protocols.c:643 lib/protocols.c:670
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "當前不支援協定 '%s'。\n"
 
-#: ../lib/protocols.c:1155
+#: lib/protocols.c:1153
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr "發現遞迴的符號鏈結 %s\n"
 
-#: ../lib/protocols.c:1533
+#: lib/protocols.c:1531
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "錯誤:遠端站臺 %s 中斷連線,已達最大連線次數…放棄連線\n"
 
-#: ../lib/protocols.c:1541
+#: lib/protocols.c:1539
 #, 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
+#: lib/protocols.c:1634 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 "錯誤:無法把執行旗標 %s 設為關閉\n"
 
-#: ../lib/pty.c:301
+#: lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "無法開啟主要的所有權 %s: %s\n"
 
-#: ../lib/pty.c:309
+#: lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "無法產生 socket pair:%s\n"
 
-#: ../lib/pty.c:338
+#: lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "錯誤:無法執行 ssh: %s\n"
 
-#: ../lib/pty.c:354
+#: lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "無法衍生另一個進程:%s\n"
 
-#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
+#: lib/rfc2068.c:30 lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "代理伺服器主機名稱:"
 
-#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
+#: lib/rfc2068.c:32 lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "防火牆主機名稱"
 
-#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
+#: lib/rfc2068.c:33 lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "代理伺服器連接埠:"
 
-#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
+#: lib/rfc2068.c:35 lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "防火牆的連接埠"
 
-#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
+#: lib/rfc2068.c:36 lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "代理伺服器用戶名稱:"
 
-#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
+#: lib/rfc2068.c:38 lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "防火牆用戶名稱"
 
-#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
+#: lib/rfc2068.c:39 lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "代理伺服器密碼:"
 
-#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
+#: lib/rfc2068.c:41 lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "防火牆密碼"
 
-#: ../lib/rfc2068.c:43
+#: lib/rfc2068.c:43
 msgid "Use HTTP/1.1"
 msgstr "使用 HTTP/1.1"
 
-#: ../lib/rfc2068.c:46
+#: lib/rfc2068.c:46
 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:840
+#: lib/rfc2068.c:151 lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -884,83 +879,83 @@ msgstr ""
 "已從伺服器接收到錯誤的回應,中斷連線中\n"
 "從遠端伺服器回傳了無效的區塊(chunk)大小 '%s'\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
+#: 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:301
+#: lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "在偏移點處開始檔案傳輸"
 
-#: ../lib/rfc2068.c:322
+#: lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "無法接收檔案 %s\n"
 
-#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
+#: lib/rfc2068.c:421 lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "正在讀取目錄清單…\n"
 
-#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
+#: lib/rfc2068.c:816 lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "收到錯誤的伺服器回應,正中斷連線\n"
 
-#: ../lib/rfc959.c:27
+#: lib/rfc959.c:27
 msgid "SITE command"
 msgstr "SITE 指令"
 
-#: ../lib/rfc959.c:28
+#: lib/rfc959.c:28
 msgid "user host"
 msgstr "帳號 主機"
 
-#: ../lib/rfc959.c:29
+#: lib/rfc959.c:29
 msgid "user host:port"
 msgstr "帳號 主機:埠號"
 
-#: ../lib/rfc959.c:30
+#: lib/rfc959.c:30
 msgid "AUTHENTICATE"
 msgstr "認證"
 
-#: ../lib/rfc959.c:31
+#: lib/rfc959.c:31
 msgid "user host port"
 msgstr "帳號 主機 埠號"
 
-#: ../lib/rfc959.c:32
+#: lib/rfc959.c:32
 msgid "user host NOAUTH"
 msgstr "帳號 主機 NOAUTH"
 
-#: ../lib/rfc959.c:33
+#: lib/rfc959.c:33
 msgid "HTTP Proxy"
 msgstr "HTTP 代理伺服器"
 
-#: ../lib/rfc959.c:34
+#: lib/rfc959.c:34
 msgid "Custom"
 msgstr "自選"
 
-#: ../lib/rfc959.c:43
+#: lib/rfc959.c:43
 msgid "Email address:"
 msgstr "電郵地址:"
 
-#: ../lib/rfc959.c:45
+#: lib/rfc959.c:45
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
 msgstr "當以匿名方式登入至遠端 FTP 伺服器時會使用本密碼"
 
-#: ../lib/rfc959.c:59
+#: lib/rfc959.c:59
 msgid "Proxy account:"
 msgstr "代理伺服器帳號:"
 
-#: ../lib/rfc959.c:61
+#: lib/rfc959.c:61
 msgid "Your firewall account (optional)"
 msgstr "防火牆帳號 (並非必要)"
 
-#: ../lib/rfc959.c:63
+#: lib/rfc959.c:63
 msgid "Proxy server type:"
 msgstr "代理伺服器類型:"
 
-#: ../lib/rfc959.c:66
+#: lib/rfc959.c:66
 #, no-c-format
 msgid ""
 "This specifies how your proxy server expects us to log in. You can specify a "
@@ -982,11 +977,11 @@ msgstr ""
 "    a: 帳號\n"
 "舉個例子,指定代理伺服器用戶可以用 %pu"
 
-#: ../lib/rfc959.c:69
+#: lib/rfc959.c:69
 msgid "Ignore PASV address"
 msgstr "忽略 PASV 位址"
 
-#: ../lib/rfc959.c:72
+#: 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 "
@@ -997,11 +992,11 @@ msgstr ""
 "IP 位址來取代之。在 PASV 回覆的情況下,這是時常需要路由器給予它們內部的 IP 位"
 "址多過外在的 IP 位址。"
 
-#: ../lib/rfc959.c:74
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "被動 (PASV) 方式傳送檔案"
 
-#: ../lib/rfc959.c:77
+#: 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. "
@@ -1015,11 +1010,11 @@ msgstr ""
 "協定的 FTP 伺服器,否則最好還是使用這個選項。如果關閉本選項,gFTP 會在客戶端"
 "開啟連接埠,讓遠端伺服器嘗試主動進行連線。"
 
-#: ../lib/rfc959.c:79
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "解析遠端符號鏈結 (LIST -L)"
 
-#: ../lib/rfc959.c:82
+#: 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 "
@@ -1029,11 +1024,11 @@ msgstr ""
 "遠端的伺服器會嘗試在列出目錄時解析符號鏈結。一般來說,最好是選用這個選項。唯"
 "一應該關閉選項的情況是遠端 FTP 伺服器中的 LIST 指令不支援 -L 選項"
 
-#: ../lib/rfc959.c:84
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "以 ASCII 模式傳送檔案"
 
-#: ../lib/rfc959.c:87
+#: lib/rfc959.c:87
 msgid ""
 "If you are transferring a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
@@ -1045,331 +1040,322 @@ msgstr ""
 "本選項。兩種系統的文字檔使用不同的方式來表示換列。如果是從 UNIX 傳送至 UNIX,"
 "則不需要選用本選項。如果是下載二元碼檔案,則必須關閉本選項。"
 
-#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
+#: lib/rfc959.c:381 lib/rfc959.c:390 lib/rfc959.c:401 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
+#: lib/rfc959.c:706 lib/socket-connect-gethostbyname.c:120
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "無法產生 IPv4 socket:%s\n"
 
-#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
+#: 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:775
+#: 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"
 
-#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
+#: lib/rfc959.c:786 lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "無法建構數據連線:%s\n"
 
-#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
+#: lib/rfc959.c:798 lib/rfc959.c:819 lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "無法讀取 socket 名稱:%s\n"
 
-#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
+#: lib/rfc959.c:809 lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "無法開啟連接埠:%s\n"
 
-#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
+#: 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:876
+#: lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "無法產生 IPv6 socket:%s\n"
 
-#: ../lib/rfc959.c:895
+#: 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:923 ../lib/rfc959.c:932
+#: lib/rfc959.c:923 lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "無效的 EPSV 回應‘%s’\n"
 
-#: ../lib/rfc959.c:989
+#: lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "無法獲取 local socket 的地址:%s\n"
 
-#: ../lib/rfc959.c:1076
+#: lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "無法接受伺服器的連線要求:%s\n"
 
-#: ../lib/rfc959.c:1584
+#: lib/rfc959.c:1584
 msgid "total"
 msgstr "總數"
 
-#: ../lib/rfc959.c:1586
+#: 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
+#: 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
+#: 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
+#: lib/socket-connect-getaddrinfo.c:115
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "無法產生 socket:%s\n"
 
-#: ../lib/socket-connect-getaddrinfo.c:121
-#: ../lib/socket-connect-gethostbyname.c:134
+#: 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
+#: 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
+#: 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
+#: 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 的網路服務,請檢查 services 檔案的內容\n"
 
-#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#: 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
+#: lib/sockutils.c:338
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "無法讀取 socket 的旗標:%s\n"
 
-#: ../lib/sockutils.c:352
+#: lib/sockutils.c:352
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "無法將 socket 設定為 non-blocking 模式:%s\n"
 
-#: ../lib/sshv2.c:28
+#: lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
-#: ../lib/sshv2.c:31
+#: lib/sshv2.c:31
 msgid "SSH Prog Name:"
 msgstr "SSH 程式名稱:"
 
-#: ../lib/sshv2.c:33
+#: lib/sshv2.c:33
 msgid "The path to the SSH executable"
 msgstr "SSH 可執行檔的路徑"
 
-#: ../lib/sshv2.c:34
+#: lib/sshv2.c:34
 msgid "SSH Extra Params:"
 msgstr "SSH 額外參數:"
 
-#: ../lib/sshv2.c:36
+#: lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
 msgstr "SSH 程式使用的額外參數"
 
-#: ../lib/sshv2.c:38
+#: lib/sshv2.c:38
 msgid "Need SSH User/Pass"
 msgstr "需要 SSH 用戶名稱/密碼"
 
-#: ../lib/sshv2.c:41
+#: lib/sshv2.c:41
 msgid "Require a username/password for SSH connections"
 msgstr "SSH 連線需要用戶名稱/密碼"
 
-#: ../lib/sshv2.c:369
+#: lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "正在執行程式 %s\n"
 
-#: ../lib/sshv2.c:378
+#: lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "請輸入 RSA 鑰匙的密碼詞組"
 
-#: ../lib/sshv2.c:379
+#: lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "請輸入鑰匙的密碼詞組"
 
-#: ../lib/sshv2.c:380
+#: lib/sshv2.c:380
 msgid "Password"
 msgstr "密碼:"
 
-#: ../lib/sshv2.c:381
+#: lib/sshv2.c:381
 msgid "password"
 msgstr "密碼:"
 
-#: ../lib/sshv2.c:496
+#: lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(是/否)?"
 
-#: ../lib/sshv2.c:514
+#: lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "輸入密碼:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
-#: ../src/gtk/transfer.c:572
+#: lib/sshv2.c:518 src/gtk/gtkui.c:138 src/gtk/transfer.c:562
+#: src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../lib/sshv2.c:519
+#: lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "輸入 SecurID 密碼:"
 
-#: ../lib/sshv2.c:567
+#: lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "錯誤:輸入了錯誤的密碼\n"
 
-#: ../lib/sshv2.c:596
+#: lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr "%d:初始化協定\n"
 
-#: ../lib/sshv2.c:600
+#: lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr "%d:協定版本 %d\n"
 
-#: ../lib/sshv2.c:609
+#: lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr "%d:開啟 %s\n"
 
-#: ../lib/sshv2.c:614
+#: lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d:關閉\n"
 
-#: ../lib/sshv2.c:618
+#: lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d:開啟目錄 %s\n"
 
-#: ../lib/sshv2.c:623
+#: lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d:讀取目錄內容\n"
 
-#: ../lib/sshv2.c:627
+#: lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d:移除檔案 %s\n"
 
-#: ../lib/sshv2.c:632
+#: lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d:新增目錄 %s\n"
 
-#: ../lib/sshv2.c:637
+#: lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d:移除目錄 %s\n"
 
-#: ../lib/sshv2.c:642
+#: lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr "%d:Realpath %s\n"
 
-#: ../lib/sshv2.c:647
+#: lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr "%d:檔案屬性\n"
 
-#: ../lib/sshv2.c:651
+#: lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr "%d:Stat %s\n"
 
-#: ../lib/sshv2.c:671
+#: lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr "%d:%s 權限變更為 %o\n"
 
-#: ../lib/sshv2.c:676
+#: lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr "%d:Utime %s %d\n"
 
-#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
-#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
-#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
-#: ../src/gtk/options_dialog.c:1437
+#: lib/sshv2.c:690
 msgid "OK"
 msgstr "確定"
 
-#: ../lib/sshv2.c:693
+#: lib/sshv2.c:693
 msgid "EOF"
 msgstr "檔案終結"
 
-#: ../lib/sshv2.c:696
+#: lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "檔案或目錄不存在"
 
-#: ../lib/sshv2.c:699
+#: lib/sshv2.c:699
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: ../lib/sshv2.c:702
+#: lib/sshv2.c:702
 msgid "Failure"
 msgstr "失敗"
 
-#: ../lib/sshv2.c:705
+#: lib/sshv2.c:705
 msgid "Bad message"
 msgstr "訊息錯誤"
 
-#: ../lib/sshv2.c:708
+#: lib/sshv2.c:708
 msgid "No connection"
 msgstr "沒有連線"
 
-#: ../lib/sshv2.c:711
+#: lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "連線中斷"
 
-#: ../lib/sshv2.c:714
+#: lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "不支援此項操作程序"
 
-#: ../lib/sshv2.c:717
+#: lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "伺服器回傳了不明的訊息"
 
-#: ../lib/sshv2.c:752
+#: lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "錯誤:訊息長度 %d 過長\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
-#: ../lib/sshv2.c:1957
+#: 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"
 
-#: ../lib/sshv2.c:817
+#: lib/sshv2.c:817
 msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
@@ -1377,41 +1363,41 @@ msgstr ""
 "在初始化一個和遠端伺服器的 SSH 連線時出現錯誤,以下的便是從遠端伺服器傳來的錯"
 "誤信息:\n"
 
-#: ../lib/sshv2.c:1160
+#: lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "正在開啟連至 %s 的 SSH 連線\n"
 
-#: ../lib/sshv2.c:1212
+#: lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "成功登入 SSH 伺服器 %s\n"
 
-#: ../lib/sslcommon.c:31
+#: lib/sslcommon.c:31
 msgid "SSL Engine"
 msgstr "SSL 引擎"
 
-#: ../lib/sslcommon.c:34
+#: lib/sslcommon.c:34
 msgid "SSL Entropy File:"
 msgstr "SSL Entropy 檔案:"
 
-#: ../lib/sslcommon.c:36
+#: lib/sslcommon.c:36
 msgid "SSL entropy file"
 msgstr "SSL entropy 檔案"
 
-#: ../lib/sslcommon.c:37
+#: lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
 msgstr "Entropy 種子的長度:"
 
-#: ../lib/sslcommon.c:39
+#: lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr "SSL 引擎播種的最大位元組數目"
 
-#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
+#: lib/sslcommon.c:41 lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr "檢查 SSL 共享連線"
 
-#: ../lib/sslcommon.c:107
+#: lib/sslcommon.c:107
 #, c-format
 msgid ""
 "Error with certificate at depth: %i\n"
@@ -1424,11 +1410,11 @@ msgstr ""
 "主題 = %s\n"
 "錯誤 %i:%s\n"
 
-#: ../lib/sslcommon.c:129
+#: lib/sslcommon.c:129
 msgid "Cannot get peer certificate\n"
 msgstr "無法取得共享連線的認證\n"
 
-#: ../lib/sslcommon.c:196
+#: lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1437,45 +1423,45 @@ msgstr ""
 "錯誤:在 SSL 認證 (%s) 裡的主機和我們已連接了的主機 (%s) 不相符,正中斷連"
 "線。\n"
 
-#: ../lib/sslcommon.c:302
+#: lib/sslcommon.c:297
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "無法初始化 OpenSSL 程式庫\n"
 
-#: ../lib/sslcommon.c:317
+#: lib/sslcommon.c:312
 msgid "Error loading default SSL certificates\n"
 msgstr "在載入預設的 SSL 認證時發生錯誤\n"
 
-#: ../lib/sslcommon.c:329
+#: lib/sslcommon.c:324
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "在設定暗號清單時發生錯誤(沒有有效的暗號)\n"
 
-#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
+#: lib/sslcommon.c:344 lib/sslcommon.c:418 lib/sslcommon.c:466
 msgid "Error: SSL engine was not initialized\n"
 msgstr "錯誤:SSL 引擎沒有被初始化\n"
 
-#: ../lib/sslcommon.c:366
+#: lib/sslcommon.c:361
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "在設定 SSL 連線時發生錯誤(BIO物件)\n"
 
-#: ../lib/sslcommon.c:376
+#: lib/sslcommon.c:371
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "在設定 SSL 連線時發生錯誤(SSL物件)\n"
 
-#: ../lib/sslcommon.c:397
+#: lib/sslcommon.c:392
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "共享連線之認證出現錯誤:%s\n"
 
-#: ../src/uicommon/gftpui.c:56
+#: src/uicommon/gftpui.c:56
 msgid "Operation canceled\n"
 msgstr "操作已取消\n"
 
-#: ../src/uicommon/gftpui.c:65
+#: src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "等待 %d 秒後重試連線直至成功\n"
 
-#: ../src/uicommon/gftpui.c:156
+#: 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 "
@@ -1484,7 +1470,7 @@ msgstr ""
 "gFTP 絕對不附任何保證;詳見檔案 COPYING。這是自由軟體,可在特定的條件下散布;"
 "詳見檔案 COPYING。\n"
 
-#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
+#: src/uicommon/gftpui.c:158 src/gtk/menu-items.c:461
 msgid "Translated by"
 msgstr ""
 "如對翻譯有任何意見,請送一封電子郵件給\n"
@@ -1495,69 +1481,69 @@ msgstr ""
 "Abel Cheung <abel oaka org>, 2002-03\n"
 "Fang Chun-Chih <ccfang1 ms21 hinet net>, 1999"
 
-#: ../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
+#: 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:216
+#: src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "用法:chmod <模式> <檔案>\n"
 
-#: ../src/uicommon/gftpui.c:257
+#: src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "用法:rename <舊檔名> <新檔名>\n"
 
-#: ../src/uicommon/gftpui.c:293
+#: src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "用法:delete <檔案>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "用法:rmdir <目錄>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "用法: site <站臺指令>\n"
 
-#: ../src/uicommon/gftpui.c:399
+#: src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "用法:mkdir <新目錄>\n"
 
-#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
+#: src/uicommon/gftpui.c:435 src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "用法:chdir <目錄>\n"
 
-#: ../src/uicommon/gftpui.c:526
+#: src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "無效的參數\n"
 
-#: ../src/uicommon/gftpui.c:539
+#: src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
 msgstr "清除目錄清單暫存記憶\n"
 
-#: ../src/uicommon/gftpui.c:628
+#: src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "用法: open"
 
-#: ../src/uicommon/gftpui.c:704
+#: src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "用法:set [變數 = 變數值]\n"
 
-#: ../src/uicommon/gftpui.c:718
+#: src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "錯誤:變數 %s 不是有效的組態變數。\n"
 
-#: ../src/uicommon/gftpui.c:725
+#: src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "錯誤:gFTP 文字模式版本中無法使用 %s 變數\n"
 
-#: ../src/uicommon/gftpui.c:807
+#: src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1565,320 +1551,319 @@ msgstr ""
 "支援的指令:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:852
+#: src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "用法: %s <檔案清單>\n"
 
-#: ../src/uicommon/gftpui.c:937
+#: src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "about"
 
-#: ../src/uicommon/gftpui.c:938
+#: src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "顯示有關 gFTP 的資訊"
 
-#: ../src/uicommon/gftpui.c:939
+#: src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:940
+#: src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "將目前的檔案傳送模式變更為文字模式 (只有 FTP 適用)"
 
-#: ../src/uicommon/gftpui.c:941
+#: src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "二進位檔"
 
-#: ../src/uicommon/gftpui.c:942
+#: src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "將目前的檔案傳送模式變更為二進位模式 (只有 FTP 適用)"
 
-#: ../src/uicommon/gftpui.c:943
+#: src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
+#: src/uicommon/gftpui.c:944 src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "進入其它遠端目錄"
 
-#: ../src/uicommon/gftpui.c:945
+#: src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:947
+#: src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:948
+#: src/uicommon/gftpui.c:948
 msgid "Changes the permissions of a remote file"
 msgstr "在遠端主機變更檔案的權限"
 
-#: ../src/uicommon/gftpui.c:949
+#: src/uicommon/gftpui.c:949
 msgid "clear"
 msgstr "clear"
 
-#: ../src/uicommon/gftpui.c:950
+#: src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr "可選用的選項:cache"
 
-#: ../src/uicommon/gftpui.c:951
+#: src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "close"
 
-#: ../src/uicommon/gftpui.c:952
+#: src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "中止和遠端站臺的連線"
 
-#: ../src/uicommon/gftpui.c:953
+#: src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "delete"
 
-#: ../src/uicommon/gftpui.c:954
+#: src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "移除遠端主機中的檔案"
 
-#: ../src/uicommon/gftpui.c:955
+#: src/uicommon/gftpui.c:955
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
+#: src/uicommon/gftpui.c:956 src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "顯示遠端主機目前的目錄及檔案清單"
 
-#: ../src/uicommon/gftpui.c:957
+#: src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
+#: src/uicommon/gftpui.c:958 src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "下載遠端的檔案"
 
-#: ../src/uicommon/gftpui.c:959
+#: src/uicommon/gftpui.c:959
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:960
+#: src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "顯示本求助訊息畫面"
 
-#: ../src/uicommon/gftpui.c:961
+#: src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
+#: src/uicommon/gftpui.c:962 src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "進入本地主機中的其它目錄"
 
-#: ../src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:965
+#: src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:966
+#: src/uicommon/gftpui.c:966
 msgid "Changes the permissions of a local file"
 msgstr "變更本地主機的檔案權限"
 
-#: ../src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "移除本地主機的檔案"
 
-#: ../src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "顯示本地主機目前的目錄及檔案清單"
 
-#: ../src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "在本地主機新增目錄"
 
-#: ../src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:976
+#: src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "顯示本地主機目前的目錄"
 
-#: ../src/uicommon/gftpui.c:977
+#: src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:978
+#: src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "變更本地主機的檔案名稱"
 
-#: ../src/uicommon/gftpui.c:979
+#: src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:980
+#: src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "移除本地主機的目錄"
 
-#: ../src/uicommon/gftpui.c:981
+#: src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:983
+#: src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:985
+#: src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:986
+#: src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "在遠端主機建構目錄"
 
-#: ../src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "上傳本機檔案"
 
-#: ../src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "open"
 
-#: ../src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "連線至遠端站臺"
 
-#: ../src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "顯示目前的遠端目錄"
 
-#: ../src/uicommon/gftpui.c:995
+#: src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "quit"
 
-#: ../src/uicommon/gftpui.c:996
+#: src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "離開 gFTP"
 
-#: ../src/uicommon/gftpui.c:997
+#: src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "rename"
 
-#: ../src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "將遠端檔案重新命名"
 
-#: ../src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "移除一個遠端目錄"
 
-#: ../src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1002
+#: src/uicommon/gftpui.c:1002
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr "顯示組態檔中的變數。您也可以透過 set var=val 的方式來設定變數。"
 
-#: ../src/uicommon/gftpui.c:1004
+#: src/uicommon/gftpui.c:1004
 msgid "site"
 msgstr "站臺"
 
-#: ../src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1005
 msgid "Run a site specific command"
 msgstr "輸入站臺的特定指令"
 
-#: ../src/uicommon/gftpui.c:1094
+#: src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "錯誤:無法辨認指令\n"
 
-#: ../src/uicommon/gftpui.c:1304
+#: src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "成功傳送 %s,速度為每秒 %.2f KB\n"
 
-#: ../src/uicommon/gftpui.c:1335
+#: src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "略過檔案 %s (主機為 %s)\n"
 
-#: ../src/uicommon/gftpui.c:1359
+#: src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "停止主機 %s 的檔案傳送\n"
 
-#: ../src/uicommon/gftpui.c:1505
+#: src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "無法下載 %s (從 %s)\n"
 
-#: ../src/uicommon/gftpui.c:1561
+#: src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
 "log for which items were not properly transferred."
 msgstr "有 %d 個無法傳送的檔案或目錄。請檢查記錄看看哪些項目未被正確傳送。"
 
-#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
-#: ../src/gtk/misc-gtk.c:513
+#: src/gtk/bookmarks.c:40 src/gtk/dnd.c:122 src/gtk/gftp-gtk.c:232
+#: src/gtk/gftp-gtk.c:1056 src/gtk/misc-gtk.c:452 src/gtk/misc-gtk.c:460
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s:進行其它操作程序前,必須先按停止按鈕\n"
 
-#: ../src/gtk/bookmarks.c:41
+#: src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
 msgstr "執行書籤"
 
-#: ../src/gtk/bookmarks.c:71
+#: src/gtk/bookmarks.c:71
 msgid "Add Bookmark: You must enter a name for the bookmark\n"
 msgstr "新增書籤:必須輸入書籤名稱\n"
 
-#: ../src/gtk/bookmarks.c:78
+#: src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
 msgstr "新增書籤:書籤 %s 已存在,無法新增書籤\n"
 
-#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:135 src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "新增書籤"
 
-#: ../src/gtk/bookmarks.c:142
+#: src/gtk/bookmarks.c:142
 msgid "Add Bookmark: You must enter a hostname\n"
 msgstr "新增書籤:必須輸入主機名稱\n"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid ""
 "Enter the name of the bookmark you want to add\n"
 "You can separate items by a / to put it into a submenu\n"
@@ -1888,137 +1873,130 @@ msgstr ""
 "您可以將書籤放進副選單,以 / 分隔即可\n"
 "(例如 Linux Sites/Debian)"
 
-#: ../src/gtk/bookmarks.c:146
+#: src/gtk/bookmarks.c:146
 msgid "Remember password"
 msgstr "記錄密碼"
 
-#: ../src/gtk/bookmarks.c:420
+#: src/gtk/bookmarks.c:418
 msgid "You must specify a name for the bookmark."
 msgstr "您必須輸入書籤名稱。"
 
-#: ../src/gtk/bookmarks.c:472
+#: src/gtk/bookmarks.c:463
 msgid "New Folder"
 msgstr "新資料夾"
 
-#: ../src/gtk/bookmarks.c:473
+#: src/gtk/bookmarks.c:464
 msgid "Enter the name of the new folder to create"
 msgstr "請輸入欲新增的資料夾名稱"
 
-#: ../src/gtk/bookmarks.c:482
+#: src/gtk/bookmarks.c:473
 msgid "New Item"
 msgstr "新項目"
 
-#: ../src/gtk/bookmarks.c:483
+#: src/gtk/bookmarks.c:474
 msgid "Enter the name of the new item to create"
 msgstr "請輸入欲新增的項目名稱"
 
-#: ../src/gtk/bookmarks.c:556
+#: src/gtk/bookmarks.c:547
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
 "%s and all its children?"
 msgstr "確定要刪除書籤 %s 及以下的所有書籤嗎?"
 
-#: ../src/gtk/bookmarks.c:557
+#: src/gtk/bookmarks.c:548
 msgid "Delete Bookmark"
 msgstr "刪除書籤"
 
-#: ../src/gtk/bookmarks.c:629
+#: src/gtk/bookmarks.c:620
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
+#: src/gtk/bookmarks.c:825
 msgid "Edit Entry"
 msgstr "修改項目"
 
-#: ../src/gtk/bookmarks.c:888
+#: src/gtk/bookmarks.c:860
 msgid "Description:"
 msgstr "說明:"
 
-#: ../src/gtk/bookmarks.c:903
+#: src/gtk/bookmarks.c:875
 msgid "Hostname:"
 msgstr "主機名稱:"
 
-#: ../src/gtk/bookmarks.c:916
+#: src/gtk/bookmarks.c:888
 msgid "Port:"
 msgstr "埠號:"
 
-#: ../src/gtk/bookmarks.c:933
+#: src/gtk/bookmarks.c:905
 msgid "Protocol:"
 msgstr "協定:"
 
-#: ../src/gtk/bookmarks.c:957
+#: src/gtk/bookmarks.c:929
 msgid "Remote Directory:"
 msgstr "遠端目錄:"
 
-#: ../src/gtk/bookmarks.c:970
+#: src/gtk/bookmarks.c:942
 msgid "Local Directory:"
 msgstr "本機目錄:"
 
-#: ../src/gtk/bookmarks.c:987
+#: src/gtk/bookmarks.c:959
 msgid "Username:"
 msgstr "用戶名稱:"
 
-#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
+#: src/gtk/bookmarks.c:972 src/text/textui.c:92
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/gtk/bookmarks.c:1014
+#: src/gtk/bookmarks.c:986
 msgid "Account:"
 msgstr "帳號:"
 
-#: ../src/gtk/bookmarks.c:1028
+#: src/gtk/bookmarks.c:1000
 msgid "Log in as ANONYMOUS"
 msgstr "匿名登入"
 
-#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
-#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
-#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
-msgid "  Cancel  "
-msgstr "取消"
-
-#: ../src/gtk/bookmarks.c:1204
+#: src/gtk/bookmarks.c:1154
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: ../src/gtk/bookmarks.c:1205
+#: src/gtk/bookmarks.c:1155
 msgid "/File/tearoff"
 msgstr "/檔案/撕下"
 
-#: ../src/gtk/bookmarks.c:1206
+#: src/gtk/bookmarks.c:1156
 msgid "/File/New _Folder..."
 msgstr "/檔案/新資料夾(_F)…"
 
-#: ../src/gtk/bookmarks.c:1207
+#: src/gtk/bookmarks.c:1157
 msgid "/File/New _Item..."
 msgstr "/檔案/新項目(_I)…"
 
-#: ../src/gtk/bookmarks.c:1208
+#: src/gtk/bookmarks.c:1158
 msgid "/File/_Delete"
 msgstr "/檔案/刪除(_D)"
 
-#: ../src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1159
 msgid "/File/_Properties..."
 msgstr "/檔案/屬性(_P)…"
 
-#: ../src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1160
 msgid "/File/sep"
 msgstr "/檔案/分隔線"
 
-#: ../src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1161
 msgid "/File/_Close"
 msgstr "/檔案/關閉(_C)"
 
-#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
+#: src/gtk/bookmarks.c:1173
 msgid "Edit Bookmarks"
 msgstr "修改書籤"
 
-#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
-#: ../src/gtk/chmod_dialog.c:142
+#: src/gtk/chmod_dialog.c:130 src/gtk/chmod_dialog.c:133
 msgid "Chmod"
 msgstr "變更檔案權限"
 
-#: ../src/gtk/chmod_dialog.c:162
+#: src/gtk/chmod_dialog.c:152
 msgid ""
 "You can now adjust the attributes of your file(s)\n"
 "Note: Not all ftp servers support the chmod feature"
@@ -2026,91 +2004,90 @@ msgstr ""
 "現在您可以變更檔案屬性\n"
 "注意:並非所有 FTP 伺服器都可以變更檔案權限"
 
-#: ../src/gtk/chmod_dialog.c:172
+#: src/gtk/chmod_dialog.c:162
 msgid "Special"
 msgstr "特殊"
 
-#: ../src/gtk/chmod_dialog.c:180
+#: src/gtk/chmod_dialog.c:170
 msgid "SUID"
 msgstr "SUID"
 
-#: ../src/gtk/chmod_dialog.c:184
+#: src/gtk/chmod_dialog.c:174
 msgid "SGID"
 msgstr "SGID"
 
-#: ../src/gtk/chmod_dialog.c:188
+#: src/gtk/chmod_dialog.c:178
 msgid "Sticky"
 msgstr "相關的"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
+#: src/gtk/chmod_dialog.c:182 src/gtk/gftp-gtk.c:771
 msgid "User"
 msgstr "使用者"
 
-#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
-#: ../src/gtk/chmod_dialog.c:240
+#: src/gtk/chmod_dialog.c:190 src/gtk/chmod_dialog.c:210
+#: src/gtk/chmod_dialog.c:230
 msgid "Read"
 msgstr "讀取"
 
-#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
-#: ../src/gtk/chmod_dialog.c:244
+#: src/gtk/chmod_dialog.c:194 src/gtk/chmod_dialog.c:214
+#: src/gtk/chmod_dialog.c:234
 msgid "Write"
 msgstr "寫入"
 
-#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
-#: ../src/gtk/chmod_dialog.c:248
+#: src/gtk/chmod_dialog.c:198 src/gtk/chmod_dialog.c:218
+#: src/gtk/chmod_dialog.c:238
 msgid "Execute"
 msgstr "執行"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
+#: src/gtk/chmod_dialog.c:202 src/gtk/gftp-gtk.c:772
 msgid "Group"
 msgstr "群組"
 
-#: ../src/gtk/chmod_dialog.c:232
+#: src/gtk/chmod_dialog.c:222
 msgid "Other"
 msgstr "其它"
 
-#: ../src/gtk/delete_dialog.c:61
+#: src/gtk/delete_dialog.c:61
 #, c-format
 msgid "Are you sure you want to delete these %ld files and %ld directories"
 msgstr "是否確定刪除以下 %ld 個檔案和 %ld 個目錄"
 
-#: ../src/gtk/delete_dialog.c:65
+#: src/gtk/delete_dialog.c:65
 #, c-format
 msgid "Are you sure you want to delete these %ld files"
 msgstr "您確定要刪除那 %ld 個檔案嗎?"
 
-#: ../src/gtk/delete_dialog.c:69
+#: src/gtk/delete_dialog.c:69
 #, c-format
 msgid "Are you sure you want to delete these %ld directories"
 msgstr "您確定要刪除那 %ld 個目錄嗎?"
 
-#: ../src/gtk/delete_dialog.c:74
+#: src/gtk/delete_dialog.c:74
 msgid "Delete Files/Directories"
 msgstr "刪除檔案/目錄"
 
-#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
+#: src/gtk/delete_dialog.c:90
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
-#: ../src/gtk/misc-gtk.c:1004
+#: src/gtk/dnd.c:123 src/gtk/gftp-gtk.c:1057 src/gtk/misc-gtk.c:817
 msgid "Connect"
 msgstr "連線"
 
-#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
+#: src/gtk/dnd.c:136 src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "已下載 URL %s\n"
 
-#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
+#: src/gtk/dnd.c:159 src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "拖放"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid "Exit"
 msgstr "離開"
 
-#: ../src/gtk/gftp-gtk.c:144
+#: src/gtk/gftp-gtk.c:142
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2118,468 +2095,455 @@ msgstr ""
 "尚有檔案仍在傳送中。\n"
 "確定要離開嗎?"
 
-#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#: src/gtk/gftp-gtk.c:217 src/gtk/gftp-gtk.c:233
 msgid "Open Location"
 msgstr "開啟位置"
 
-#: ../src/gtk/gftp-gtk.c:219
+#: src/gtk/gftp-gtk.c:217
 msgid "Enter a URL to connect to"
 msgstr "輸入一個要連接的 URL"
 
-#: ../src/gtk/gftp-gtk.c:265
+#: src/gtk/gftp-gtk.c:263
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:266
+#: src/gtk/gftp-gtk.c:264
 msgid "/FTP/tearoff"
 msgstr "/FTP/撕下"
 
-#: ../src/gtk/gftp-gtk.c:267
+#: src/gtk/gftp-gtk.c:265
 msgid "/FTP/Window _1"
 msgstr "/FTP/視窗 _1"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: src/gtk/gftp-gtk.c:267
 msgid "/FTP/Window _2"
 msgstr "/FTP/視窗 _2"
 
-#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
-#: ../src/gtk/gftp-gtk.c:279
+#: src/gtk/gftp-gtk.c:269 src/gtk/gftp-gtk.c:274 src/gtk/gftp-gtk.c:277
 msgid "/FTP/sep"
 msgstr "/FTP/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:272
+#: src/gtk/gftp-gtk.c:270
 msgid "/FTP/_Ascii"
 msgstr "/FTP/純文字檔(_A)"
 
-#: ../src/gtk/gftp-gtk.c:274
+#: src/gtk/gftp-gtk.c:272
 msgid "/FTP/_Binary"
 msgstr "/FTP/二進位檔(_B)"
 
-#: ../src/gtk/gftp-gtk.c:277
+#: src/gtk/gftp-gtk.c:275
 msgid "/FTP/_Preferences..."
 msgstr "/檔案/屬性(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:280
+#: src/gtk/gftp-gtk.c:278
 msgid "/FTP/_Quit"
 msgstr "/FTP/離開(_Q)"
 
-#: ../src/gtk/gftp-gtk.c:281
+#: src/gtk/gftp-gtk.c:279
 msgid "/_Local"
 msgstr "/本機(_L)"
 
-#: ../src/gtk/gftp-gtk.c:282
+#: src/gtk/gftp-gtk.c:280
 msgid "/Local/tearoff"
 msgstr "/本機/撕下"
 
-#: ../src/gtk/gftp-gtk.c:283
+#: src/gtk/gftp-gtk.c:281
 msgid "/Local/_Open Location..."
 msgstr "/本機/開啟位置(_O)…"
 
-#: ../src/gtk/gftp-gtk.c:285
+#: src/gtk/gftp-gtk.c:283
 msgid "/Local/D_isconnect"
 msgstr "/本機/中斷連線(_I)"
 
-#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
+#: src/gtk/gftp-gtk.c:284 src/gtk/gftp-gtk.c:291
 msgid "/Local/sep"
 msgstr "/本機/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:287
+#: src/gtk/gftp-gtk.c:285
 msgid "/Local/Change _Filespec..."
 msgstr "/本機/篩選檔案清單(_F)…"
 
-#: ../src/gtk/gftp-gtk.c:289
+#: src/gtk/gftp-gtk.c:287
 msgid "/Local/_Show selected"
 msgstr "/本機/顯示選取項目(_S)"
 
-#: ../src/gtk/gftp-gtk.c:290
+#: src/gtk/gftp-gtk.c:288
 msgid "/Local/Select _All"
 msgstr "/本機/全選(_A)"
 
-#: ../src/gtk/gftp-gtk.c:291
+#: src/gtk/gftp-gtk.c:289
 msgid "/Local/Select All Files"
 msgstr "/本機/選取所有檔案"
 
-#: ../src/gtk/gftp-gtk.c:292
+#: src/gtk/gftp-gtk.c:290
 msgid "/Local/Deselect All"
 msgstr "/本機/全部不選"
 
-#: ../src/gtk/gftp-gtk.c:294
+#: src/gtk/gftp-gtk.c:292
 msgid "/Local/Save Directory Listing..."
 msgstr "/本機/儲存目錄清單…"
 
-#: ../src/gtk/gftp-gtk.c:295
+#: src/gtk/gftp-gtk.c:293
 msgid "/Local/Send SITE Command..."
 msgstr "/本機/傳送 SITE 指令…"
 
-#: ../src/gtk/gftp-gtk.c:296
+#: src/gtk/gftp-gtk.c:294
 msgid "/Local/_Change Directory"
 msgstr "/本機/前往其它目錄(_C)"
 
-#: ../src/gtk/gftp-gtk.c:297
+#: src/gtk/gftp-gtk.c:295
 msgid "/Local/_Permissions..."
 msgstr "/本機/變更權限(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:299
+#: src/gtk/gftp-gtk.c:297
 msgid "/Local/_New Folder..."
 msgstr "/檔案/新資料夾(_N)…"
 
-#: ../src/gtk/gftp-gtk.c:300
+#: src/gtk/gftp-gtk.c:298
 msgid "/Local/Rena_me..."
 msgstr "/本機/變更檔名(_M)…"
 
-#: ../src/gtk/gftp-gtk.c:302
+#: src/gtk/gftp-gtk.c:300
 msgid "/Local/_Delete..."
 msgstr "/本機/刪除(_D)…"
 
-#: ../src/gtk/gftp-gtk.c:304
+#: src/gtk/gftp-gtk.c:302
 msgid "/Local/_Edit..."
 msgstr "/本機/編輯(_E)…"
 
-#: ../src/gtk/gftp-gtk.c:305
+#: src/gtk/gftp-gtk.c:303
 msgid "/Local/_View..."
 msgstr "/本機/檢視(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:306
+#: src/gtk/gftp-gtk.c:304
 msgid "/Local/_Refresh"
 msgstr "/本機/更新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:308
+#: src/gtk/gftp-gtk.c:306
 msgid "/_Remote"
 msgstr "/遠端(_R)"
 
-#: ../src/gtk/gftp-gtk.c:309
+#: src/gtk/gftp-gtk.c:307
 msgid "/Remote/tearoff"
 msgstr "/遠端/撕下"
 
-#: ../src/gtk/gftp-gtk.c:310
+#: src/gtk/gftp-gtk.c:308
 msgid "/Remote/_Open Location..."
 msgstr "/遠端/開啟位置(_O)…"
 
-#: ../src/gtk/gftp-gtk.c:312
+#: src/gtk/gftp-gtk.c:310
 msgid "/Remote/D_isconnect"
 msgstr "/遠端/中斷連線(_I)"
 
-#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+#: src/gtk/gftp-gtk.c:312 src/gtk/gftp-gtk.c:319
 msgid "/Remote/sep"
 msgstr "/遠端/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:315
+#: src/gtk/gftp-gtk.c:313
 msgid "/Remote/Change _Filespec..."
 msgstr "/遠端/篩選檔案清單(_F)…"
 
-#: ../src/gtk/gftp-gtk.c:317
+#: src/gtk/gftp-gtk.c:315
 msgid "/Remote/_Show selected"
 msgstr "/遠端/顯示選取項目(_S)"
 
-#: ../src/gtk/gftp-gtk.c:318
+#: src/gtk/gftp-gtk.c:316
 msgid "/Remote/Select _All"
 msgstr "/遠端/全選(_A)"
 
-#: ../src/gtk/gftp-gtk.c:319
+#: src/gtk/gftp-gtk.c:317
 msgid "/Remote/Select All Files"
 msgstr "/遠端/選取所有檔案"
 
-#: ../src/gtk/gftp-gtk.c:320
+#: src/gtk/gftp-gtk.c:318
 msgid "/Remote/Deselect All"
 msgstr "/遠端/全部不選"
 
-#: ../src/gtk/gftp-gtk.c:322
+#: src/gtk/gftp-gtk.c:320
 msgid "/Remote/Save Directory Listing..."
 msgstr "/遠端/儲存目錄清單…"
 
-#: ../src/gtk/gftp-gtk.c:323
+#: src/gtk/gftp-gtk.c:321
 msgid "/Remote/Send SITE Command..."
 msgstr "/遠端/傳送 SITE 指令…"
 
-#: ../src/gtk/gftp-gtk.c:324
+#: src/gtk/gftp-gtk.c:322
 msgid "/Remote/_Change Directory"
 msgstr "/遠端/前往其它目錄(_C)"
 
-#: ../src/gtk/gftp-gtk.c:325
+#: src/gtk/gftp-gtk.c:323
 msgid "/Remote/_Permisssions..."
 msgstr "/遠端/變更權限(_P)…"
 
-#: ../src/gtk/gftp-gtk.c:326
+#: src/gtk/gftp-gtk.c:324
 msgid "/Remote/_New Folder..."
 msgstr "/檔案/新資料夾(_N)…"
 
-#: ../src/gtk/gftp-gtk.c:328
+#: src/gtk/gftp-gtk.c:326
 msgid "/Remote/Rena_me..."
 msgstr "/遠端/變更檔名(_M)…"
 
-#: ../src/gtk/gftp-gtk.c:330
+#: src/gtk/gftp-gtk.c:328
 msgid "/Remote/_Delete..."
 msgstr "/遠端/刪除(_D)…"
 
-#: ../src/gtk/gftp-gtk.c:331
+#: src/gtk/gftp-gtk.c:329
 msgid "/Remote/_Edit..."
 msgstr "/遠端/編輯(_E)…"
 
-#: ../src/gtk/gftp-gtk.c:332
+#: src/gtk/gftp-gtk.c:330
 msgid "/Remote/_View..."
 msgstr "/遠端/查看(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:333
+#: src/gtk/gftp-gtk.c:331
 msgid "/Remote/_Refresh"
 msgstr "/遠端/更新(_R)"
 
-#: ../src/gtk/gftp-gtk.c:335
+#: src/gtk/gftp-gtk.c:333
 msgid "/_Bookmarks"
 msgstr "/書籤(_B)"
 
-#: ../src/gtk/gftp-gtk.c:336
+#: src/gtk/gftp-gtk.c:334
 msgid "/Bookmarks/tearoff"
 msgstr "/書籤/撕下"
 
-#: ../src/gtk/gftp-gtk.c:337
+#: src/gtk/gftp-gtk.c:335
 msgid "/Bookmarks/Add _Bookmark"
 msgstr "/書籤/新增書籤(_B)"
 
-#: ../src/gtk/gftp-gtk.c:339
+#: src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Edit Bookmarks"
 msgstr "/書籤/修改書籤"
 
-#: ../src/gtk/gftp-gtk.c:340
+#: src/gtk/gftp-gtk.c:338
 msgid "/Bookmarks/sep"
 msgstr "/書籤/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:341
+#: src/gtk/gftp-gtk.c:339
 msgid "/_Transfer"
 msgstr "/傳送(_T)"
 
-#: ../src/gtk/gftp-gtk.c:342
+#: src/gtk/gftp-gtk.c:340
 msgid "/Transfer/tearoff"
 msgstr "/傳送/撕下"
 
-#: ../src/gtk/gftp-gtk.c:343
+#: src/gtk/gftp-gtk.c:341
 msgid "/Transfer/_Start"
 msgstr "/傳送/開始(_S)"
 
-#: ../src/gtk/gftp-gtk.c:344
+#: src/gtk/gftp-gtk.c:342
 msgid "/Transfer/St_op"
 msgstr "/傳送/停止(_O)"
 
-#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:352
 msgid "/Transfer/sep"
 msgstr "/傳送/分隔線"
 
-#: ../src/gtk/gftp-gtk.c:347
+#: src/gtk/gftp-gtk.c:345
 msgid "/Transfer/Skip _Current File"
 msgstr "/傳送/略過當前的檔案(_C)"
 
-#: ../src/gtk/gftp-gtk.c:348
+#: src/gtk/gftp-gtk.c:346
 msgid "/Transfer/_Remove File"
 msgstr "/傳送/移除檔案(_R)"
 
-#: ../src/gtk/gftp-gtk.c:350
+#: src/gtk/gftp-gtk.c:348
 msgid "/Transfer/Move File _Up"
 msgstr "/傳送/將檔案上移(_U)"
 
-#: ../src/gtk/gftp-gtk.c:352
+#: src/gtk/gftp-gtk.c:350
 msgid "/Transfer/Move File _Down"
 msgstr "/傳送/將檔案下移(_D)"
 
-#: ../src/gtk/gftp-gtk.c:355
+#: src/gtk/gftp-gtk.c:353
 msgid "/Transfer/_Retrieve Files"
 msgstr "/傳送/下載檔案(_R)"
 
-#: ../src/gtk/gftp-gtk.c:356
+#: src/gtk/gftp-gtk.c:354
 msgid "/Transfer/_Put Files"
 msgstr "/傳送/上傳檔案(_P)"
 
-#: ../src/gtk/gftp-gtk.c:357
+#: src/gtk/gftp-gtk.c:355
 msgid "/L_og"
 msgstr "/記錄(_O)"
 
-#: ../src/gtk/gftp-gtk.c:358
+#: src/gtk/gftp-gtk.c:356
 msgid "/Log/tearoff"
 msgstr "/記錄/撕下"
 
-#: ../src/gtk/gftp-gtk.c:359
+#: src/gtk/gftp-gtk.c:357
 msgid "/Log/_Clear"
 msgstr "/記錄/清除(_C)"
 
-#: ../src/gtk/gftp-gtk.c:360
+#: src/gtk/gftp-gtk.c:358
 msgid "/Log/_View"
 msgstr "/本機/檢視(_V)…"
 
-#: ../src/gtk/gftp-gtk.c:361
+#: src/gtk/gftp-gtk.c:359
 msgid "/Log/_Save..."
 msgstr "/記錄/儲存(_S)…"
 
-#: ../src/gtk/gftp-gtk.c:362
+#: src/gtk/gftp-gtk.c:360
 msgid "/Tool_s"
 msgstr "/工具(_S)"
 
-#: ../src/gtk/gftp-gtk.c:363
+#: src/gtk/gftp-gtk.c:361
 msgid "/Tools/tearoff"
 msgstr "/工具/撕下"
 
-#: ../src/gtk/gftp-gtk.c:364
+#: src/gtk/gftp-gtk.c:362
 msgid "/Tools/C_ompare Windows"
 msgstr "/工具/比較兩邊視窗(_O)"
 
-#: ../src/gtk/gftp-gtk.c:365
+#: src/gtk/gftp-gtk.c:363
 msgid "/Tools/_Clear Cache"
 msgstr "/工具/清除暫存快取(_C)"
 
-#: ../src/gtk/gftp-gtk.c:366
+#: src/gtk/gftp-gtk.c:364
 msgid "/Help"
 msgstr "/求助(_H)"
 
-#: ../src/gtk/gftp-gtk.c:367
+#: src/gtk/gftp-gtk.c:365
 msgid "/Help/tearoff"
 msgstr "/求助/撕下"
 
-#: ../src/gtk/gftp-gtk.c:368
+#: src/gtk/gftp-gtk.c:366
 msgid "/Help/_About"
 msgstr "/求助/關於(_A)"
 
-#: ../src/gtk/gftp-gtk.c:488
-msgid "Host: "
-msgstr "主機:"
-
-#: ../src/gtk/gftp-gtk.c:490
+#: src/gtk/gftp-gtk.c:485
 msgid "_Host: "
 msgstr "主機(_H):"
 
-#: ../src/gtk/gftp-gtk.c:516
+#: src/gtk/gftp-gtk.c:508
 msgid "Port: "
 msgstr "埠:"
 
-#: ../src/gtk/gftp-gtk.c:537
-msgid "User: "
-msgstr "用戶:"
-
-#: ../src/gtk/gftp-gtk.c:539
+#: src/gtk/gftp-gtk.c:528
 msgid "_User: "
 msgstr "使用者(_U):"
 
-#: ../src/gtk/gftp-gtk.c:564
+#: src/gtk/gftp-gtk.c:550
 msgid "Pass: "
 msgstr "密碼:"
 
-#: ../src/gtk/gftp-gtk.c:636
+#: src/gtk/gftp-gtk.c:618
 msgid "Command: "
 msgstr "指令:"
 
-#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
-#: ../src/gtk/gtkui_transfer.c:228
+#: src/gtk/gftp-gtk.c:769 src/gtk/gftp-gtk.c:968 src/gtk/gtkui_transfer.c:226
 msgid "Filename"
 msgstr "檔名"
 
-#: ../src/gtk/gftp-gtk.c:788
+#: src/gtk/gftp-gtk.c:770
 msgid "Size"
 msgstr "檔案大小"
 
-#: ../src/gtk/gftp-gtk.c:791
+#: src/gtk/gftp-gtk.c:773
 msgid "Date"
 msgstr "日期"
 
-#: ../src/gtk/gftp-gtk.c:792
+#: src/gtk/gftp-gtk.c:774
 msgid "Attribs"
 msgstr "屬性"
 
-#: ../src/gtk/gftp-gtk.c:997
+#: src/gtk/gftp-gtk.c:969
 msgid "Progress"
 msgstr "進度"
 
-#: ../src/gtk/gftp-gtk.c:1133
+#: src/gtk/gftp-gtk.c:1086
 msgid "Error: You must type in a host to connect to\n"
 msgstr "錯誤:必須輸入準備連上的主機名稱\n"
 
-#: ../src/gtk/gtkui.c:53
+#: src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "更新"
 
-#: ../src/gtk/gtkui.c:120
+#: src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "輸入使用者名稱"
 
-#: ../src/gtk/gtkui.c:121
+#: src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "請輸入您在這個站臺的使用者名稱"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
+#: src/gtk/gtkui.c:139 src/gtk/transfer.c:563 src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "請輸入您在這個站臺的密碼"
 
-#: ../src/gtk/gtkui.c:298
+#: src/gtk/gtkui.c:286
 msgid "Operation canceled...you must enter a string\n"
 msgstr "操作取消…您必須輸入一個字串\n"
 
-#: ../src/gtk/gtkui.c:344
+#: src/gtk/gtkui.c:332
 msgid "Mkdir"
 msgstr "新增目錄"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Make Directory"
 msgstr "新增目錄"
 
-#: ../src/gtk/gtkui.c:347
+#: src/gtk/gtkui.c:335
 msgid "Enter name of directory to create"
 msgstr "輸入準備新增的目錄名稱"
 
-#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
-#: ../src/gtk/misc-gtk.c:1007
+#: src/gtk/gtkui.c:358 src/gtk/gtkui.c:370 src/gtk/misc-gtk.c:820
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../src/gtk/gtkui.c:380
+#: src/gtk/gtkui.c:368
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "您想把 %s 變更為甚麼名稱呢?"
 
-#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:390 src/gtk/gtkui.c:393
 msgid "Site"
 msgstr "站臺"
 
-#: ../src/gtk/gtkui.c:405
+#: src/gtk/gtkui.c:393
 msgid "Enter site-specific command"
 msgstr "輸入站臺的特定指令"
 
-#: ../src/gtk/gtkui.c:406
+#: src/gtk/gtkui.c:394
 msgid "Prepend with SITE"
 msgstr "先前站臺待定的"
 
-#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
+#: src/gtk/gtkui.c:437 src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "前往其它目錄"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
-#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
+#: 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:520
-#: ../src/gtk/transfer.c:545
+#: 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
+#: src/gtk/gtkui_transfer.c:136 src/gtk/gtkui_transfer.c:294
+#: src/gtk/gtkui_transfer.c:321
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
-#: ../src/gtk/gtkui_transfer.c:347
+#: src/gtk/gtkui_transfer.c:143 src/gtk/gtkui_transfer.c:300
+#: src/gtk/gtkui_transfer.c:327
 msgid "Resume"
 msgstr "續傳"
 
-#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
+#: src/gtk/gtkui_transfer.c:150 src/gtk/gtkui_transfer.c:297
 msgid "Skip"
 msgstr "略過"
 
-#: ../src/gtk/gtkui_transfer.c:231
+#: src/gtk/gtkui_transfer.c:229
 msgid "Action"
 msgstr "行動"
 
-#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
-#: ../src/gtk/transfer.c:91
+#: src/gtk/gtkui_transfer.c:231 src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "傳送檔案"
 
-#: ../src/gtk/gtkui_transfer.c:257
+#: src/gtk/gtkui_transfer.c:242
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2587,70 +2551,70 @@ msgstr ""
 "下列檔案在本地及遠端的主機都存在\n"
 "請決定處理方法"
 
-#: ../src/gtk/gtkui_transfer.c:323
+#: src/gtk/gtkui_transfer.c:303
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/gtk/gtkui_transfer.c:353
+#: src/gtk/gtkui_transfer.c:333
 msgid "Skip File"
 msgstr "略過檔案"
 
-#: ../src/gtk/gtkui_transfer.c:363
+#: src/gtk/gtkui_transfer.c:343
 msgid "Select All"
 msgstr "全選"
 
-#: ../src/gtk/gtkui_transfer.c:369
+#: src/gtk/gtkui_transfer.c:349
 msgid "Deselect All"
 msgstr "全部不選"
 
-#: ../src/gtk/menu-items.c:65
+#: src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
 msgstr "篩選檔案清單:操作取消…必須輸入字串\n"
 
-#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "篩選檔案清單"
 
-#: ../src/gtk/menu-items.c:86
+#: src/gtk/menu-items.c:86
 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:81
+#: src/gtk/menu-items.c:114 src/gtk/menu-items.c:291 src/gtk/menu-items.c:348
+#: src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "錯誤:無法開啟 %s 寫入資料:%s\n"
 
-#: ../src/gtk/menu-items.c:143
+#: src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "儲存目錄清單"
 
-#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
+#: src/gtk/menu-items.c:314 src/gtk/menu-items.c:371
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "錯誤:寫入 %s 時發生錯誤:%s\n"
 
-#: ../src/gtk/menu-items.c:402
+#: src/gtk/menu-items.c:382
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "成功將日誌檔案寫入 %s\n"
 
-#: ../src/gtk/menu-items.c:414
+#: src/gtk/menu-items.c:394
 msgid "Save Log"
 msgstr "儲存日誌"
 
-#: ../src/gtk/menu-items.c:450
+#: src/gtk/menu-items.c:428
 #, c-format
 msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr "找不到使用條款檔案 COPYING。請確定它在 %s 或 %s"
 
-#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
+#: src/gtk/menu-items.c:430
 msgid "About gFTP"
 msgstr "關於 gFTP"
 
-#: ../src/gtk/menu-items.c:490
+#: src/gtk/menu-items.c:460
 #, c-format
 msgid ""
 "%s\n"
@@ -2662,27 +2626,23 @@ msgstr ""
 "官方網頁:http://www.gftp.org/\n";
 "標誌作者:Aaron Worley <planet_hoth yahoo com>\n"
 
-#: ../src/gtk/menu-items.c:503
+#: src/gtk/menu-items.c:473
 msgid "About"
 msgstr "關於"
 
-#: ../src/gtk/menu-items.c:552
+#: src/gtk/menu-items.c:506
 msgid "License Agreement"
 msgstr "使用條款"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
-msgid "  Close  "
-msgstr "  關閉  "
-
-#: ../src/gtk/menu-items.c:685
+#: src/gtk/menu-items.c:613
 msgid "Compare Windows"
 msgstr "比較視窗"
 
-#: ../src/gtk/misc-gtk.c:257
+#: src/gtk/misc-gtk.c:209
 msgid "Disconnect from the remote server"
 msgstr "中止和遠端伺服器的連線"
 
-#: ../src/gtk/misc-gtk.c:261
+#: src/gtk/misc-gtk.c:213
 msgid ""
 "Connect to the site specified in the host entry. If the host entry is blank, "
 "then a dialog is presented that will allow you to enter a URL."
@@ -2690,72 +2650,56 @@ msgstr ""
 "正在連線到在主機輸入欄位指定了的站臺。如果主機輸入欄位是空白的話,會出現一個"
 "對話盒,它會容許您輸入一個 URL。"
 
-#: ../src/gtk/misc-gtk.c:308
+#: src/gtk/misc-gtk.c:260
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../src/gtk/misc-gtk.c:318
+#: src/gtk/misc-gtk.c:270
 msgid "] (Cached) ["
 msgstr "] (在暫存記憶內) ["
 
-#: ../src/gtk/misc-gtk.c:329
+#: src/gtk/misc-gtk.c:281
 msgid "Not connected"
 msgstr "尚未連線"
 
-#: ../src/gtk/misc-gtk.c:431
+#: src/gtk/misc-gtk.c:383
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "開啟檔案 %s 發生錯誤:%s\n"
 
-#: ../src/gtk/misc-gtk.c:521
+#: src/gtk/misc-gtk.c:468
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s:尚未連線至遠端站臺\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: src/gtk/misc-gtk.c:475
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s:使用此種協定時,本項功能無效\n"
 
-#: ../src/gtk/misc-gtk.c:536
+#: src/gtk/misc-gtk.c:483
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s:只能選擇一個項目\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: src/gtk/misc-gtk.c:490
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s:至少必須選擇一個項目\n"
 
-#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
+#: src/gtk/misc-gtk.c:814
 msgid "Change"
 msgstr "變更"
 
-#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
-msgid "Add"
-msgstr "新增"
-
-#: ../src/gtk/misc-gtk.c:1024
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/gtk/misc-gtk.c:1094
-msgid "  Yes  "
-msgstr "  是  "
-
-#: ../src/gtk/misc-gtk.c:1104
-msgid "  No  "
-msgstr "  否  "
-
-#: ../src/gtk/misc-gtk.c:1164
+#: src/gtk/misc-gtk.c:973
 msgid "Getting directory listings"
 msgstr "正在擷取目錄清單"
 
-#: ../src/gtk/misc-gtk.c:1184
+#: src/gtk/misc-gtk.c:993
 msgid "  Stop  "
 msgstr "  停止  "
 
-#: ../src/gtk/misc-gtk.c:1194
+#: src/gtk/misc-gtk.c:1003
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2764,109 +2708,89 @@ msgstr ""
 "已下載 %ld 個目錄\n"
 "及 %ld 個檔案"
 
-#: ../src/gtk/misc-gtk.c:1270
+#: src/gtk/misc-gtk.c:1079
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP 錯誤:在 %2$s 或 %3$s 找不到 %1$s 檔案\n"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Edit Host"
 msgstr "修改主機名稱"
 
-#: ../src/gtk/options_dialog.c:956
+#: src/gtk/options_dialog.c:907
 msgid "Add Host"
 msgstr "新增主機"
 
-#: ../src/gtk/options_dialog.c:1002
-msgid "Type:"
-msgstr "類型:"
-
-#: ../src/gtk/options_dialog.c:1004
+#: src/gtk/options_dialog.c:939
 msgid "_Type:"
 msgstr "類型(_T):"
 
-#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
+#: src/gtk/options_dialog.c:948
 msgid "Domain"
 msgstr "網域名稱"
 
-#: ../src/gtk/options_dialog.c:1047
-msgid "Network Address"
-msgstr "網路位址"
-
-#: ../src/gtk/options_dialog.c:1049
+#: src/gtk/options_dialog.c:978
 msgid "_Network address:"
 msgstr "網路位址(_N):"
 
-#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
-msgid "Netmask"
-msgstr "網路遮罩"
-
-#: ../src/gtk/options_dialog.c:1090
+#: src/gtk/options_dialog.c:1013
 msgid "N_etmask:"
 msgstr "網路遮罩(_E):"
 
-#: ../src/gtk/options_dialog.c:1139
+#: src/gtk/options_dialog.c:1056
 msgid "_Domain:"
 msgstr "網域名稱(_D):"
 
-#: ../src/gtk/options_dialog.c:1247
+#: src/gtk/options_dialog.c:1133
+msgid "Netmask"
+msgstr "網路遮罩"
+
+#: src/gtk/options_dialog.c:1139
 msgid "Local Hosts"
 msgstr "本地主機"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
-msgid "Edit"
-msgstr "編輯"
-
-#: ../src/gtk/options_dialog.c:1290
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
+#: src/gtk/options_dialog.c:1240
 msgid "Options"
 msgstr "選項"
 
-#: ../src/gtk/options_dialog.c:1459
-msgid "Apply"
-msgstr "套用"
-
-#: ../src/gtk/transfer.c:30
+#: src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "正在接收檔名…"
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
+#: src/gtk/transfer.c:63 src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "連線中…"
 
-#: ../src/gtk/transfer.c:99
+#: src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "擷取檔案:尚未連上遠端站臺\n"
 
-#: ../src/gtk/transfer.c:336
+#: src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "錯誤:副進程 %d 回傳值為 %d\n"
 
-#: ../src/gtk/transfer.c:345
+#: src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "副進程 %d 成功執行\n"
 
-#: ../src/gtk/transfer.c:352
+#: src/gtk/transfer.c:352
 #, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "錯誤:副進程 %d 沒有正常的結束\n"
 
-#: ../src/gtk/transfer.c:368
+#: src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "錯誤:無法獲取檔案 %s 的資訊:%s\n"
 
-#: ../src/gtk/transfer.c:374
+#: src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "檔案 %s 沒有任何變更\n"
 
-#: ../src/gtk/transfer.c:382
+#: src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2875,110 +2799,113 @@ msgstr ""
 "檔案 %s 已經變更了。\n"
 "要把它上傳嗎?"
 
-#: ../src/gtk/transfer.c:385
+#: src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "編輯檔案"
 
-#: ../src/gtk/transfer.c:476
+#: src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "完成"
 
-#: ../src/gtk/transfer.c:734
+#: 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,預計 %02d:%02d:%02d 後結束"
 
-#: ../src/gtk/transfer.c:739
+#: src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr ""
 "已傳送 %s 位元組 (總共 %s),速度為每秒 %.2fKB,預計 %02d:%02d:%02d 後結束"
 
-#: ../src/gtk/transfer.c:750
+#: src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
 msgstr "已傳送 %s 位元組 (總共 %s),傳送延誤,無法估計時間"
 
-#: ../src/gtk/transfer.c:756
+#: src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "已傳送 %s 位元組 (總共 %s),傳送延誤,無法估計時間"
 
-#: ../src/gtk/transfer.c:800
+#: src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "不明的百份比已完成。(第 %ld 個檔案,共 %ld 個檔案)"
 
-#: ../src/gtk/transfer.c:804
+#: 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 後結束。(第 %ld 個檔案,共 %ld 個)"
 
-#: ../src/gtk/transfer.c:842
+#: src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "正在讀取檔名…%s 位元組"
 
-#: ../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
+#: 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"
 
-#: ../src/gtk/view_dialog.c:34
+#: src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "查看"
 
-#: ../src/gtk/view_dialog.c:49
+#: src/gtk/view_dialog.c:34
+msgid "Edit"
+msgstr "編輯"
+
+#: 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:52
+#: 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:123
+#: 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
+#: src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "查看:無法衍生另一個程序:%s\n"
 
-#: ../src/gtk/view_dialog.c:180
+#: src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "正在執行程式:%s %s\n"
 
-#: ../src/gtk/view_dialog.c:240
+#: src/gtk/view_dialog.c:238
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "開啟 %s (使用 %s)\n"
 
-#: ../src/gtk/view_dialog.c:282
+#: src/gtk/view_dialog.c:280
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "正在查看檔案 %s\n"
 
-#: ../src/gtk/view_dialog.c:289
+#: src/gtk/view_dialog.c:287
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "查看:無法開啟檔案 %s:%s\n"
 
-#: ../src/text/gftp-text.c:166
+#: src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "無法開啟控制終端機 %s\n"
 
-#: ../src/text/textui.c:80
+#: src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "使用者名稱 [匿名]:"
 
-#: ../src/text/textui.c:158
+#: src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
@@ -2987,3 +2914,39 @@ msgid ""
 msgstr ""
 "%s 已經存在。(原始檔的大小:%s,目的檔的大小:%s):\n"
 "覆寫(o),續傳(r),略過(s),全部覆寫(O),全部續傳(R),全部略過(S):(%c)"
+
+#~ msgid "  Cancel  "
+#~ msgstr "取消"
+
+#~ msgid "Host: "
+#~ msgstr "主機:"
+
+#~ msgid "User: "
+#~ msgstr "用戶:"
+
+#~ msgid "  Close  "
+#~ msgstr "  關閉  "
+
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "  Yes  "
+#~ msgstr "  是  "
+
+#~ msgid "  No  "
+#~ msgstr "  否  "
+
+#~ msgid "Type:"
+#~ msgstr "類型:"
+
+#~ msgid "Network Address"
+#~ msgstr "網路位址"
+
+#~ msgid "_Edit"
+#~ msgstr "編輯(_E)"
+
+#~ msgid "Apply"
+#~ msgstr "套用"



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